From 5dffa3f934ed5c9d21bef66357c690c70f7cbc36 Mon Sep 17 00:00:00 2001 From: nickkatsios Date: Fri, 13 Sep 2024 19:39:55 +0300 Subject: [PATCH 1/2] add liqWeight, gaugePoint slectors in r9-whitelist --- protocol/reseed/data/r9-whitelist.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/protocol/reseed/data/r9-whitelist.json b/protocol/reseed/data/r9-whitelist.json index 6240a1f74..b7f8df433 100644 --- a/protocol/reseed/data/r9-whitelist.json +++ b/protocol/reseed/data/r9-whitelist.json @@ -69,8 +69,8 @@ "0", "160000000000000000000", "16000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA00A3F7aaF99476862533Fe7DcA4b50f6158cB", true, true, true, true], [ @@ -93,8 +93,8 @@ "0", "260000000000000000000", "26000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA0093f626Ce32dd6dA19617ba4e7aA0c3228e8", true, true, true, true], [ @@ -117,8 +117,8 @@ "0", "140000000000000000000", "14000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA00865405A02215B44eaADB853d0d2192Fc29D", true, true, true, true], [ @@ -141,8 +141,8 @@ "0", "200000000000000000000", "20000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA008aC57c2bEfe82E87d1D8Fb9f4784d0B73cA", true, true, true, true], [ @@ -165,8 +165,8 @@ "0", "120000000000000000000", "12000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279", true, true, true, true], [ @@ -189,8 +189,8 @@ "0", "120000000000000000000", "12000000", - ["0x0000000000000000000000000000000000000000", "0xd8317c71", "0x00", "0x00"], - ["0x0000000000000000000000000000000000000000", "0xa8b0bb83", "0x00", "0x00"] + ["0x0000000000000000000000000000000000000000", "0xe4b8d822", "0x00", "0x00"], + ["0x0000000000000000000000000000000000000000", "0x2c5fa218", "0x00", "0x00"] ], ["0xBEA00bE150FEF7560A8ff3C68D07387693Ddfd0b", true, true, true, true], [ From 4b29e879634eee2cd7c79a779cea3b6bcc0caaf0 Mon Sep 17 00:00:00 2001 From: Brean0 Date: Sat, 14 Sep 2024 15:49:57 +0200 Subject: [PATCH 2/2] update libUsdOracle --- .../contracts/beanstalk/init/reseed/L2/ReseedWhitelist.sol | 4 ++-- protocol/reseed/data/r9-whitelist.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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/r9-whitelist.json b/protocol/reseed/data/r9-whitelist.json index b7f8df433..b04d8d24f 100644 --- a/protocol/reseed/data/r9-whitelist.json +++ b/protocol/reseed/data/r9-whitelist.json @@ -4,7 +4,7 @@ "0xBEA0005B8599265D41256905A9B3073D397812E4", [ "0x5a049a47", - "0", + "1", "10000", "0", "0", @@ -61,7 +61,7 @@ "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", [ "0xc84c7727", - "0", + "1", "10000", "0", "0", @@ -85,7 +85,7 @@ "0x5979D7b546E38E414F7E9822514be443A4800529", [ "0xc84c7727", - "0", + "1", "10000", "0", "0",