diff --git a/protocol/foundry.toml b/protocol/foundry.toml index 655d63be4..42c0630cb 100644 --- a/protocol/foundry.toml +++ b/protocol/foundry.toml @@ -42,7 +42,6 @@ ignored_warnings_from = [ gas_reports = ['*'] # Cache to `$HOME/.foundry/cache//`. no_storage_caching = false -no_match_contract = "ReseedStateTest" [profile.differential] match_test = "testDiff" diff --git a/protocol/hardhat.config.js b/protocol/hardhat.config.js index 79f5bc625..006e034d7 100644 --- a/protocol/hardhat.config.js +++ b/protocol/hardhat.config.js @@ -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({ diff --git a/protocol/reseed/data/r9-whitelist.json b/protocol/reseed/data/r9-whitelist.json index b37083825..ede4a327d 100644 --- a/protocol/reseed/data/r9-whitelist.json +++ b/protocol/reseed/data/r9-whitelist.json @@ -288,7 +288,7 @@ "0x2540be400", "0x5525", "0x5f35c50f0", - "0x00", + "0x01", "-0x31974f", "120000000000000000000", "12000000", diff --git a/protocol/reseed/dataConverts/convertWhitelist.js b/protocol/reseed/dataConverts/convertWhitelist.js index 977bfbdb3..a6570d3d3 100644 --- a/protocol/reseed/dataConverts/convertWhitelist.js +++ b/protocol/reseed/dataConverts/convertWhitelist.js @@ -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 =