Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix encode type setting for BEAN:USDC and add L2 BCM address as owner. #1095

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Fix encode type setting for BEAN:USDC and add L2 BCM address as owner. #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion protocol/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ ignored_warnings_from = [
gas_reports = ['*']
# Cache to `$HOME/.foundry/cache/<chain id>/<block number>`.
no_storage_caching = false
no_match_contract = "ReseedStateTest"

[profile.differential]
match_test = "testDiff"
Expand Down
4 changes: 2 additions & 2 deletions protocol/hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ task("reseedL1", async () => {
task("reseedL2", async () => {
// the account that deploys the new diamond address at nonce 0.
let beanstalkDeployer = await impersonateSigner("0xe26367ca850da09a478076481535d7c1c67d62f9");
// todo: get l2bcm once deployed.
let l2bcm = await impersonateSigner("0xe26367ca850da09a478076481535d7c1c67d62f8");
// the l2 bcm safe account address.
let l2bcm = await impersonateSigner("0xDd5b31E73dB1c566Ca09e1F1f74Df34913DaaF69");
await mintEth(beanstalkDeployer.address);
await mintEth(l2bcm.address);
await reseedL2({
Expand Down
2 changes: 1 addition & 1 deletion protocol/reseed/data/r9-whitelist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
"0x2540be400",
"0x5525",
"0x5f35c50f0",
"0x00",
"0x01",
"-0x31974f",
"120000000000000000000",
"12000000",
Expand Down
7 changes: 7 additions & 0 deletions protocol/reseed/dataConverts/convertWhitelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,13 @@ function parseWhitelist(inputFilePath, outputFilePath) {
var tokenAssetSettings = defaultAssetSettings;
if (token in assetSettings) {
tokenAssetSettings = assetSettings[token];

// 3crv was not a well and thus had an ecode type of 0x00
// BEAN:USDC is now a well and thus has an encode type of 0x01
// for more info see System.sol
if (token === "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279") {
tokenAssetSettings.encodeType = "0x01";
}
}

var tokenToGpAndOptimalPercentDepositedBdv =
Expand Down
Loading