diff --git a/protocol/contracts/beanstalk/init/reseed/L2/ReseedWhitelist.sol b/protocol/contracts/beanstalk/init/reseed/L2/ReseedWhitelist.sol index 7f689c8cd..fe1ac68e8 100644 --- a/protocol/contracts/beanstalk/init/reseed/L2/ReseedWhitelist.sol +++ b/protocol/contracts/beanstalk/init/reseed/L2/ReseedWhitelist.sol @@ -36,14 +36,14 @@ contract ReseedWhitelist { s.sys.usdTokenPrice[token] = 1; s.sys.twaReserves[token].reserve0 = 1; s.sys.twaReserves[token].reserve1 = 1; + // LP tokens will require an Oracle Implmentation for the non Bean Asset. + s.sys.oracleImplementation[nonBeanToken] = oracle[i]; } // add asset settings for the underlying lp token s.sys.silo.assetSettings[token] = assets[i]; // add whitelist status s.sys.silo.whitelistStatuses.push(whitelistStatus[i]); - // the Oracle should return the price for the non-bean asset in USD - s.sys.oracleImplementation[nonBeanToken] = oracle[i]; } } } diff --git a/protocol/reseed/data/exports/storage-system20736200.json b/protocol/reseed/data/exports/storage-system20736200.json index f6b666ff0..686113e73 100644 --- a/protocol/reseed/data/exports/storage-system20736200.json +++ b/protocol/reseed/data/exports/storage-system20736200.json @@ -962,7 +962,7 @@ "seedGaugeSettings": { "maxBeanMaxLpGpPerBdvRatio": "0x0", "minBeanMaxLpGpPerBdvRatio": "0x0", - "targetSeasonsToCatchUp": "0x0", + "targetSeasonsToCatchUp": "0x01", "podRateLowerBound": "0x0", "podRateOptimal": "0x0", "podRateUpperBound": "0x0", @@ -971,7 +971,10 @@ "lpToSupplyRatioUpperBound": "0x0", "lpToSupplyRatioOptimal": "0x0", "lpToSupplyRatioLowerBound": "0x0", - "excessivePriceThreshold": "0x0" + "excessivePriceThreshold": "0x0", + "soilCoefficientHigh": "0x0", + "soilCoefficientLow": "0x0", + "baseReward": "0x0" }, "sop": {} } \ No newline at end of file diff --git a/protocol/reseed/data/r9-whitelist.json b/protocol/reseed/data/r9-whitelist.json index b7f8df433..c2634067d 100644 --- a/protocol/reseed/data/r9-whitelist.json +++ b/protocol/reseed/data/r9-whitelist.json @@ -4,75 +4,154 @@ "0xBEA0005B8599265D41256905A9B3073D397812E4", [ "0x5a049a47", - "0", - "10000", - "0", - "0", + "0x55bb3a", + "0x2540be400", + "0x5da8", + "0x7ca7bfc44", "0x00", - "0", - "0", - "0", - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + "-0x773", + "0", + "0", + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ] + ], + [ + "0xBEA0005B8599265D41256905A9B3073D397812E4", + true, + false, + false, + false ], - ["0xBEA0005B8599265D41256905A9B3073D397812E4", true, false, false, false], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ] ], [ "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", [ "0xc8cda2a0", - "1", - "10000", - "0", - "0", + "0x1", + "0x2540be400", + "0x5525", + "0x0", "0x00", - "0", - "0", - "0", - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + "0x1", + "0", + "0", + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ] ], - ["0x1BEA054dddBca12889e07B3E076f511Bf1d27543", true, false, false, false], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + [ + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", + true, + false, + false, + false + ], + [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ] ], [ "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", [ "0xb0c22bb1", - "1", - "10000", - "0", - "0", + "0x1", + "0x2540be400", + "0x5525", + "0x0", "0x00", - "0", - "0", - "0", - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + "0x1", + "0", + "0", + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ] + ], + [ + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", + true, + false, + false, + false ], - ["0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", true, false, false, false], - ["0x0000000000000000000000000000000000000000", "0x00000000", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ] ], [ "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", [ "0xc84c7727", - "0", - "10000", - "0", - "0", + "0x1", + "0x2540be400", + "0x5da8", + "0x8af1713bf", "0x01", - "0", + "0x0", "160000000000000000000", "16000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", + true, + true, + true, + true ], - ["0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", true, true, true, true], [ "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612", "0x00000000", @@ -85,18 +164,34 @@ "0x5979D7b546E38E414F7E9822514be443A4800529", [ "0xc84c7727", - "0", - "10000", - "0", - "0", + "0x55bb3a", + "0x2540be400", + "0x5da8", + "0xd385df6d", "0x01", - "0", + "-0x773", "260000000000000000000", "26000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8", + true, + true, + true, + true ], - ["0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8", true, true, true, true], [ "0x74749a1c8b2faa03c7259F90919628b1241A2ea5", "0xb0dd7409", @@ -117,10 +212,26 @@ "0", "140000000000000000000", "14000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D", + true, + true, + true, + true ], - ["0xBEA00865405A02215B44eaADB853d0d2192Fc29D", true, true, true, true], [ "0x74749a1c8b2faa03c7259F90919628b1241A2ea5", "0xb0dd7409", @@ -141,10 +252,26 @@ "0", "200000000000000000000", "20000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA", + true, + true, + true, + true ], - ["0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA", true, true, true, true], [ "0xd0C7101eACbB49F3deCcCc166d238410D6D46d57", "0x00000000", @@ -156,19 +283,35 @@ "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", "0xaf88d065e77c8cC2239327C5EDb3A432268e5831", [ - "0xc84c7727", - "1", - "10000", - "0", - "0", - "0x01", - "0", + "0x00000000", + "0x1", + "0x2540be400", + "0x5525", + "0x5f35c50f0", + "0x00", + "-0x31974f", "120000000000000000000", "12000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", + true, + true, + true, + true ], - ["0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", true, true, true, true], [ "0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3", "0x00000000", @@ -189,10 +332,26 @@ "0", "120000000000000000000", "12000000", - ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] + [ + "0x0000000000000000000000000000000000000000", + "0xe4b8d822", + "0x00", + "0x00" + ], + [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" + ] + ], + [ + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b", + true, + true, + true, + true ], - ["0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b", true, true, true, true], [ "0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7", "0x00000000", @@ -200,4 +359,4 @@ "0x000000000000000000000000000000000000000000000000000000000001fa40" ] ] -] +] \ No newline at end of file diff --git a/protocol/reseed/dataConverts/convertGlobal.js b/protocol/reseed/dataConverts/convertGlobal.js index 34cb1c593..9942bed6a 100644 --- a/protocol/reseed/dataConverts/convertGlobal.js +++ b/protocol/reseed/dataConverts/convertGlobal.js @@ -166,10 +166,10 @@ function parseGlobals(inputFilePath, outputFilePath) { data.seedGaugeSettings?.soilCoefficientHigh ? convertToBigNum(data.seedGaugeSettings.soilCoefficientHigh) : "0", - data.seedGaugeSettings?.baseReward ? convertToBigNum(data.seedGaugeSettings.baseReward) : "0", - data.seedGaugeSettings?.excessivePriceThreshold - ? convertToBigNum(data.seedGaugeSettings.excessivePriceThreshold) - : "0" + data.seedGaugeSettings?.soilCoefficientLow + ? convertToBigNum(data.seedGaugeSettings.soilCoefficientLow) + : "0", + data.seedGaugeSettings?.baseReward ? convertToBigNum(data.seedGaugeSettings.baseReward) : "0" ], // ShipmentRoute data.shipmentRoutes.length diff --git a/protocol/reseed/dataConverts/convertWhitelist.js b/protocol/reseed/dataConverts/convertWhitelist.js new file mode 100644 index 000000000..12b31ddac --- /dev/null +++ b/protocol/reseed/dataConverts/convertWhitelist.js @@ -0,0 +1,245 @@ +const fs = require("fs"); +const { convertToBigNum } = require("../../utils/read.js"); + +// map from LP token to non-bean token +const nonBeanTokenMapping = { + "0xBEA0005B8599265D41256905A9B3073D397812E4": "0xBEA0005B8599265D41256905A9B3073D397812E4", + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543": "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788": "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8": "0x5979D7b546E38E414F7E9822514be443A4800529", + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D": "0x35751007a407ca6FEFfE80b3cB397736D2cf4dbe", + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831", + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9" +}; + +const tokenToOracleMapping = { + "0xBEA0005B8599265D41256905A9B3073D397812E4": [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ], + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543": [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ], + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788": [ + "0x0000000000000000000000000000000000000000", + "0x00000000", + "0x00", + "0x00" + ], + "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1": [ + "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612", + "0x00000000", + "0x01", + "0x000000000000000000000000000000000000000000000000000000000001fa40" + ], + "0x5979D7b546E38E414F7E9822514be443A4800529": [ + "0x74749a1c8b2faa03c7259F90919628b1241A2ea5", + "0xb0dd7409", + "0x00", + "0x000000000000000000000000639fe6ab55c921f74e7fac1ee960c0b6293ba6120000000000000000000000000000000000000000000000000000000000003840000000000000000000000000e141425bc1594b8039de6390db1cdaf4397ea22b000000000000000000000000000000000000000000000000000000000001fa4000000000000000000000000035751007a407ca6feffe80b3cb397736d2cf4dbe" + ], + "0x35751007a407ca6FEFfE80b3cB397736D2cf4dbe": [ + "0x74749a1c8b2faa03c7259F90919628b1241A2ea5", + "0xb0dd7409", + "0x00", + "0x000000000000000000000000639fe6ab55c921f74e7fac1ee960c0b6293ba6120000000000000000000000000000000000000000000000000000000000003840000000000000000000000000b523ae262d20a936bc152e6023996e46fdc2a95d000000000000000000000000000000000000000000000000000000000001fa400000000000000000000000005979d7b546e38e414f7e9822514be443a4800529" + ], + "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f": [ + "0xd0C7101eACbB49F3deCcCc166d238410D6D46d57", + "0x00000000", + "0x01", + "0x000000000000000000000000000000000000000000000000000000000001fa40" + ], + "0xaf88d065e77c8cC2239327C5EDb3A432268e5831": [ + "0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3", + "0x00000000", + "0x01", + "0x000000000000000000000000000000000000000000000000000000000001fa40" + ], + "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9": [ + "0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7", + "0x00000000", + "0x01", + "0x000000000000000000000000000000000000000000000000000000000001fa40" + ] +}; + +// 0x2c5fa218 is sig for "maxWeight(bytes memory)" +const liquidityWeightImpl = [ + "0x0000000000000000000000000000000000000000", + "0x2c5fa218", + "0x00", + "0x00" +]; +// 0xe4b8d822 is sig for ""function defaultGaugePointFunction(uint256 currentGaugePoints,uint256 optimalPercentDepositedBdv,uint256 percentOfDepositedBdv,bytes memory)"" +const gaugePointImpl = ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"]; + +const tokensToWhitelist = [ + "0xBEA0005B8599265D41256905A9B3073D397812E4", + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8", + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D", + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA", + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b" +]; + +const defaultAssetSettings = { + selector: "0xc84c7727", + stalkEarnedPerSeason: "1", + stalkIssuedPerBdv: "10000", + milestoneSeason: "0", + milestoneStem: "0", + encodeType: "0x01", + deltaStalkEarnedPerSeason: "0", + gaugePoints: "0", + optimalPercentDepositedBdv: "0" +}; + +const tokenToWhitelistMapping = { + "0xBEA0005B8599265D41256905A9B3073D397812E4": [ + "0xBEA0005B8599265D41256905A9B3073D397812E4", + true, + false, + false, + false + ], + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543": [ + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543", + true, + false, + false, + false + ], + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788": [ + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788", + true, + false, + false, + false + ], + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB": [ + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", + true, + true, + true, + true + ], + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8": [ + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8", + true, + true, + true, + true + ], + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D": [ + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D", + true, + true, + true, + true + ], + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA": [ + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA", + true, + true, + true, + true + ], + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279": [ + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", + true, + true, + true, + true + ], + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b": [ + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b", + true, + true, + true, + true + ] +}; + +const tokenToGpAndOptimalPercentDepositedBdvMapping = { + "0xBEA0005B8599265D41256905A9B3073D397812E4": ["0", "0"], + "0x1BEA054dddBca12889e07B3E076f511Bf1d27543": ["0", "0"], + "0x1BEA059c3Ea15F6C10be1c53d70C75fD1266D788": ["0", "0"], + "0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB": ["160000000000000000000", "16000000"], + "0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8": ["260000000000000000000", "26000000"], + "0xBEA00865405A02215B44eaADB853d0d2192Fc29D": ["140000000000000000000", "14000000"], + "0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA": ["200000000000000000000", "20000000"], + "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279": ["120000000000000000000", "12000000"], + "0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b": ["120000000000000000000", "12000000"] +}; + +function parseWhitelist(inputFilePath, outputFilePath) { + try { + const data = JSON.parse(fs.readFileSync(inputFilePath, "utf8")); + const assetSettings = data.silo.assetSettings; + const output = {}; + + for (const token of tokensToWhitelist) { + var nonBeanToken = nonBeanTokenMapping[token]; + var tokenAssetSettings = defaultAssetSettings; + if (token in assetSettings) { + tokenAssetSettings = assetSettings[token]; + } + + var tokenToGpAndOptimalPercentDepositedBdv = + tokenToGpAndOptimalPercentDepositedBdvMapping[token]; + + output[token] = [ + token, + // non-bean token, this is used for Oracle settings + nonBeanToken, + // silo settings array + // the gaugePoint and LiquidityWeight Selectors are now moved due + // to the Implementation Update, and thus are set manually. + [ + tokenAssetSettings.selector, + tokenAssetSettings.stalkEarnedPerSeason, + tokenAssetSettings.stalkIssuedPerBdv, + tokenAssetSettings.milestoneSeason, + tokenAssetSettings.milestoneStem, + tokenAssetSettings.encodeType, + tokenAssetSettings.deltaStalkEarnedPerSeason, + tokenToGpAndOptimalPercentDepositedBdv[0], + tokenToGpAndOptimalPercentDepositedBdv[1], + gaugePointImpl, + liquidityWeightImpl + ], + // whitelist status + tokenToWhitelistMapping[token], + // oracle implementation (for the non-bean token) + tokenToOracleMapping[nonBeanToken] + ]; + } + + // only order requirement is that unripe tokens should be first + + var finalOutput = []; + + // loop through output and put into finalOutput in order of tokensToWhitelist + for (const token of tokensToWhitelist) { + finalOutput.push(output[token]); + } + + fs.writeFileSync(outputFilePath, JSON.stringify(finalOutput, null, 2)); + console.log("Whitelist JSON has been written successfully"); + } catch (err) { + console.error("Error:", err); + } +} + +exports.parseWhitelist = parseWhitelist; diff --git a/protocol/reseed/reseedL2.js b/protocol/reseed/reseedL2.js index 2a4b17806..d23bd76a7 100644 --- a/protocol/reseed/reseedL2.js +++ b/protocol/reseed/reseedL2.js @@ -1,6 +1,7 @@ const { parseAccountStatus } = require("./dataConverts/convertAccountStatuses.js"); const { parseInternalBalances } = require("./dataConverts/convertInternalBalances.js"); const { parseField } = require("./dataConverts/convertField.js"); +const { parseWhitelist } = require("./dataConverts/convertWhitelist.js"); const { parseDeposits } = require("./dataConverts/convertDeposits.js"); const { parseFertilizer } = require("./dataConverts/convertFert.js"); const { parsePodMarketplace } = require("./dataConverts/convertPodMarketplace.js"); @@ -176,6 +177,7 @@ function parseBeanstalkData() { "./reseed/data/r2/L2_external_unripe_lp_balances.json", contractAccounts ); + parseWhitelist(storageSystemPath, "./reseed/data/r9-whitelist.json"); } async function printBeanstalk() { diff --git a/protocol/test/foundry/Migration/data/accounts.txt b/protocol/test/foundry/Migration/data/accounts.txt index ebd76bd1b..f1af72ef5 100644 --- a/protocol/test/foundry/Migration/data/accounts.txt +++ b/protocol/test/foundry/Migration/data/accounts.txt @@ -7,94 +7,4 @@ 0x0086e622aC7afa3e5502dc895Fd0EAB8B3A78D97 0x008829aCd7Ec452Fc50989aA9BFa5d196Baae20a 0x008D63fab8179Ee0aE2082Bb57C72ED0c61f990f -0x00975ae9c986df066c7bbDA496103B4cC44B26c3 -0x00aaEa7B4dC89E4a4fACDa32da496ba5D8E1216d -0x00C459905bC314E03Af933020dea4644BE06aaD9 -0x00Ca340D789F00d4c978b236606C3105A09254F8 -0x0106B2C42DB283a5faf3FAA351ed5b9f00FD51ce -0x0127F5b0e559D1C8C054d83f8F187CDFDc80B608 -0x01914D6E47657d6A7893F84Fc84660dc5aec08b6 -0x01C7145c01d06a026D3dDA4700b727fE62677628 -0x01e82e6c90fa599067E1F59323064055F5007A26 -0x02009370Ff755704E9acbD96042C1ab832D6067e -0x0245934a930544C7046069968eB4339B03adDFcf -0x0255b20571acc2e1708ADE387b692360537F9e89 -0x0259D65954DfbD0735E094C9CdACC256e5A29dD4 -0x028afa72DADB6311107c382cF87504F37F11D482 -0x029D058CFdBE37eb93949e4143c516557B89EB3c -0x02A527084F5E73AF7781846762c8753aCD096461 -0x02bfbb25bf8396910378bF3b3ce82C0CE6d5E61d -0x02df7e960FFda6Db4030003D1784A7639947d200 -0x02FE27e7000C7B31E25E08dC3cDFdE5F39d659c5 -0x0301871FeDc523AB336535Ed14B939A956c4c39F -0x030ae585DB6d5169B3594eC37c008662f2494a1D -0x031B8ece36b2C1f14C870421A1989AEbe3d7bcFa -0x03768446C681761669Ab6DC721762Aa065c81f26 -0x0399ecFbb2a9D0D520738b3179FA685cD5c6D692 -0x03F52a039d9665C19a771204493B53B81C9405aF -0x0440bDd684444f1433f3d1E0208656abF9993C52 -0x04776ef6C70C281E13deDaf50AA8bbA75fbecA31 -0x047B22BFE547d29843c825dbcBd9E0168649d631 -0x04Dc1bDcb450Ea6734F5001B9CeCb0Cd09690f4f -0x04F095a8B608527B336DcfE5cC8A5Ac253007Dec -0x0519064e3216cf6d6643Cc65dB1C39C20ABE50e0 -0x051f77131b0ea6d149608021E06c7206317782CC -0x052E8fABDCE1dB054590664944B16e1df4B57898 -0x055C419F4841f6A3153E64a4E174a242A4fFA6f0 -0x0562695929503E930DE265F944B899dEBF93Df7c -0x056590F16D5b314a132BbCFb1283fEc5D5C6E670 -0x05cD14412ccd74F05379199181aA1847ed4802fd -0x05Dc8E95a479dDA8C8Fc5a27Eb825f5042048937 -0x0625fAaD99bCD3d22C91aB317079F6616e81e3c0 -0x06319B2e91A7C559105eE81fF599FaFFEDbAd000 -0x066E9372fF4D618ba8f9b1E366463A18DD711e5E -0x0679bE304b60cd6ff0c254a16Ceef02Cb19ca1B8 -0x0686002661e6a2A1E86b8Cb897C2eC226060481b -0x0692Ee6b5c88870DA8105aFEAA834A20091a29Ff -0x0694356524F17a18A0Ac3e1d8e767eeEBd8A4ad9 -0x069e85D4F1010DD961897dC8C095FBB5FF297434 -0x072Fa8a20fA621665B94745A8075073ceAdFE1DC -0x077165031d8d46B52368A8C92E8333437fb60EF8 -0x07806c232D6F669Eb9cD33FD2834869aa14EE4F4 -0x078ad2Aa3B4527e4996D087906B2a3DA51BbA122 -0x07A75Ba044cDAaa624aAbAD27CB95C42510AF4B5 -0x083aA7FF9AE00099471902178bf2fda4e6aC14Bf -0x084D73726d2824478dF09bE72EcAB4177F7F1bd7 -0x08535BBDd792254C23d6fBE21c25252461E740b8 -0x0872FcfE9C10993c0e55bb0d0c61c327933D6549 -0x0898512055826732026aC02242E7D7B66fccC2B0 -0x08b4aeB2b1475214aa7a3E9aCc6C5E359796f297 -0x08fD119453cD459F7E9e4232AD9816266863BFb1 -0x093037BA3A1e350f549F0Ff8Ff17C86B1FfA2B4b -0x0933F554312C7bcB86dF896c46A44AC2381383D1 -0x0959BE05E1C3aDC6Ee20D6fA1252Bb0906A94743 -0x095B9C41921415636F91F9B5754786Ed6CA6f1d4 -0x0968d6491823b97446220081C511328d8d9Fb61D -0x0988D84619708DCe4a9298939e5449d528Dc800B -0x09Ad186D43615aa3131c6064538aF6E0A643Ce12 -0x09Bc3c127ED4c491880c2A250d6d034696cb5fC1 -0x0ab72D3f6eddF0e382f5CF4098fFAb85EA961077 -0x0b248c6A152F35A4678dF45Baf5958Ce8A8CaCCc -0x0B54B916E90b8f28ad21dA40638E0724132C9c93 -0x0b8e605A7446801ae645e57de5AAbbc251cD1e3c -0x0b8fc89A38698B9BB52C544a1dBCc85ADfcA4153 -0x0baBD9Eba4c7C739Edd2dBCd6de0b7C483068948 -0x0Bb53dE33DF0F8BA40E0E06Be85998f506c4C7bc -0x0Bbe643D5d9DD0498d0C9546F728504A4aAb78f4 -0x0Bc7F48e752407108C0A164928DF7c65Aa4de31f -0x0be9A9100A95075270e47De519D53c5fc8F7C936 -0x0bFD9FC73C82bE0558f3A651F10a8BD8c784F45E -0x0C040E41b5b17374b060872295cBE10Ec8954550 -0x0cb556AebE39b3c9EF5CBe8b668E925DB10a2D7D -0x0ccBCaA60D8b59bDf751B70Ee623d58c609170ac -0x0d07708d0E155865D9baEe9963E16ddd46F5dECF -0x0d0bD6469BE80d57893cf1B21434936dfAA35319 -0x0d3fc68CA620bCFac48F18d75C6B6a8b0ffb8Fbb -0x0d5d11732391E14E2084596F0F521d4d363164B6 -0x0d7E219D07ddE19fc3dfA9Ede55528b725231Ee5 -0x0D935eaA0EaFcFe11f111638FEe358651456D29C -0x0d94B6e4c2Aa9383964986020B3534D34885f700 -0x0DBFe040866BBF36f0231b589d26020bBAb923D2 -0x0DE299534957329688a735d03961dBd848A5f87f -0x0df3e4945E0Fa652D0FFEBc1bce58D1a14d9f9e0 -0x0e0826998f02b2353499a12a0Ea8d8EEbe27567f \ No newline at end of file +0x00975ae9c986df066c7bbDA496103B4cC44B26c3 \ No newline at end of file