-
Notifications
You must be signed in to change notification settings - Fork 83
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bean:Eth -> Bean:wStEth Migration #765
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r
@@ -359,6 +361,7 @@ contract Storage { | |||
bool abovePeg; // | 1 (24) | |||
uint16 stemStartSeason; // | 2 (26) | |||
uint16 stemScaleSeason; //──────────┘ 2 (28/32) | |||
uint32 beanEthStartMintingSeason; //──────────┘ 2 (28/32) NOTE: Reset and delete after Bean:wStEth migration has been completed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix style
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -121,6 +121,7 @@ contract Account { | |||
* @param isApprovedForAll A mapping of ERC1155 operator to approved status. ERC1155 compatability. | |||
* @param farmerGerminating A Farmer's germinating stalk. Seperated into odd and even stalk. | |||
* @param deposits SiloV3.1 deposits. A mapping from depositId to Deposit. SiloV3.1 introduces greater precision for deposits. | |||
* @param barnRaiseWell The Well that the Barn Raise adds liquidity to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be in the appStorage natspec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was on natspec of AppStorage
and State
. Fixed here:
204b580#diff-9314f54b6e0c572c10e8145556daa1904a394fe43008d9ebf3181c618e51bb46L124
@@ -21,7 +21,10 @@ contract Oracle is ReentrancyGuard { | |||
//////////////////// ORACLE INTERNAL //////////////////// | |||
|
|||
function stepOracle() internal returns (int256 deltaB) { | |||
deltaB = LibWellMinting.capture(C.BEAN_ETH_WELL); | |||
// TODO: Make more dynamic if becomes a bottleneck. Potentially use LibWhitelistedTokens. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lets do it now, given all gauge tokens should be included in the minting whitelist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed:
9a39c57
* @dev No protocol should use this function to calculate manipulation resistant Bean price data. | ||
**/ | ||
function price() external view returns (Prices memory p) { | ||
p.ps = new P.Pool[](2); | ||
p.ps = new P.Pool[](3); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we generalize this as well? huge developer pain to continously update the beanstalkPrice contract upon a new addition to the silo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generalized to include all Well tokens assuming that are CP2:
7d11d62
@@ -99,7 +100,7 @@ library LibConvert { | |||
if (tokenOut == C.UNRIPE_BEAN) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need to replace urBEANETH to urLP
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done here:
4ea7406
newDepositedLPBeans | ||
); | ||
|
||
uint256 newLP = IWell(C.BEAN_ETH_WELL).sync( | ||
uint256 newLP = IWell(barnRaiseWell).sync( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you think there's any validity in verifying that sync
performs as expected? or up to beanstalk DAO to confirm?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed sync
for addLiquidity
:
97f905d
using SafeERC20 for IERC20; | ||
using LibSafeMath32 for uint32; | ||
|
||
// gauge point factor is used to scale up the gauge points of the bean and bean3crv pools. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
update comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done here:
71930ff
*/ | ||
contract InitMigrateUnripeBeanEthToBeanSteth { | ||
using SafeERC20 for IERC20; | ||
using LibSafeMath32 for uint32; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed here:
71930ff
protocol/contracts/C.sol
Outdated
@@ -79,10 +79,15 @@ library C { | |||
uint256 internal constant WELL_MINIMUM_BEAN_BALANCE = 1000_000_000; // 1,000 Beans | |||
address internal constant BEANSTALK_PUMP = 0xBA510f10E3095B83a0F33aa9ad2544E22570a87C; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
update to legacy
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed BEANSTALK_PUMP
from here:
e0a4006
…Beanstalk into wsteth-migration-changes
No description provided.