Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update Github Actions to include mainnet-eth * ETH-base bulker scenario * WstETHPriceFeed + tests (#600) * Non-ETH and ETH bulker scenarios (all actions in one txn) * Mainnet WETH Bulker (#611) * Add a supply cap constraint and set initial caps to 0 for cWETHv3 * Update the collateral params based on Gauntlet recommendations (#628) https://hackmd.io/wncIvkFTReWUe2AMMK2ezA?view * Price feeds for WETH deployment + Bulker changes for OZ audit (#625) This PR implements and modifies price feeds to support the upcoming WETH deployment. The favored plan so far is to use ETH-denominated price feeds as opposed to USD price feeds, but stick with using 8 decimals for prices to avoid having to change the `Comet` and `Configurator` implementations. This would require: - A new wrapper price feed (`ScalingPriceFeed.sol`) that scales prices up or down to 8 decimals - A new `ConstantPriceFeed` that always returns 1e8 for the `WETH` base asset, since should always hold a 1:1 value with ETH - Modifications to the `WstETHPriceFeed` to return prices in terms of ETH instead of USD This is an alternative approach to #626, which is a more complex change but could be a better long-term solution. *Note: This PR also now contains the changes from #634 and #635, which address some suggestions made by OZ for their audit of `WstETHPriceFeed` and `Bulker`.*
- Loading branch information
Showing
43 changed files
with
1,740 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity 0.8.15; | ||
|
|
||
| import "./IPriceFeed.sol"; | ||
|
|
||
| contract ConstantPriceFeed is IPriceFeed { | ||
| /// @notice Version of the price feed | ||
| uint public constant override version = 1; | ||
|
|
||
| /// @notice Description of the price feed | ||
| string public constant description = "Constant price feed"; | ||
|
|
||
| /// @notice Number of decimals for returned prices | ||
| uint8 public immutable override decimals; | ||
|
|
||
| /// @notice The constant price | ||
| int public immutable constantPrice; | ||
|
|
||
| /** | ||
| * @notice Construct a new scaling price feed | ||
| * @param decimals_ The number of decimals for the returned prices | ||
| **/ | ||
| constructor(uint8 decimals_, int256 constantPrice_) { | ||
| decimals = decimals_; | ||
| constantPrice = constantPrice_; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Price for the latest round | ||
| * @return roundId Round id from the underlying price feed | ||
| * @return answer Latest price for the asset (will always be a constant price) | ||
| * @return startedAt Timestamp when the round was started; passed on from underlying price feed | ||
| * @return updatedAt Timestamp when the round was last updated; passed on from underlying price feed | ||
| * @return answeredInRound Round id in which the answer was computed; passed on from underlying price feed | ||
| **/ | ||
| function latestRoundData() external view returns ( | ||
| uint80 roundId, | ||
| int256 answer, | ||
| uint256 startedAt, | ||
| uint256 updatedAt, | ||
| uint80 answeredInRound | ||
| ) { | ||
| return (0, constantPrice, block.timestamp, block.timestamp, 0); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity 0.8.15; | ||
|
|
||
| /** | ||
| * @title IERC20NonStandard | ||
| * @dev Version of ERC20 with no return values for `transfer` and `transferFrom` | ||
| * See https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca | ||
| */ | ||
| interface IERC20NonStandard { | ||
| function approve(address spender, uint256 amount) external; | ||
| function transfer(address to, uint256 value) external; | ||
| function transferFrom(address from, address to, uint256 value) external; | ||
| function balanceOf(address account) external view returns (uint256); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity 0.8.15; | ||
|
|
||
| /** | ||
| * @dev Interface for price feeds used by Comet | ||
| * Note This is Chainlink's AggregatorV3Interface, but without the `getRoundData` function. | ||
| */ | ||
| interface IPriceFeed { | ||
| function decimals() external view returns (uint8); | ||
|
|
||
| function description() external view returns (string memory); | ||
|
|
||
| function version() external view returns (uint256); | ||
|
|
||
| function latestRoundData() | ||
| external | ||
| view | ||
| returns ( | ||
| uint80 roundId, | ||
| int256 answer, | ||
| uint256 startedAt, | ||
| uint256 updatedAt, | ||
| uint80 answeredInRound | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity 0.8.15; | ||
|
|
||
| import "./ERC20.sol"; | ||
|
|
||
| /** | ||
| * @dev Interface for interacting with WstETH contract | ||
| * Note Not a comprehensive interface | ||
| */ | ||
| interface IWstETH is ERC20 { | ||
| function stETH() external returns (address); | ||
|
|
||
| function wrap(uint256 _stETHAmount) external returns (uint256); | ||
| function unwrap(uint256 _wstETHAmount) external returns (uint256); | ||
|
|
||
| function receive() external payable; | ||
|
|
||
| function getWstETHByStETH(uint256 _stETHAmount) external view returns (uint256); | ||
| function getStETHByWstETH(uint256 _wstETHAmount) external view returns (uint256); | ||
|
|
||
| function stEthPerToken() external view returns (uint256); | ||
| function tokensPerStEth() external view returns (uint256); | ||
| } |
Oops, something went wrong.