Merge branch 'reseed-final-fixes' into beanstalk3-ui-sdks

BeanstalkFarms · Sep 16, 2024 · 64125be · 64125be
2 parents 25444dc + d812f74
commit 64125be
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 28 deletions.
diff --git a/protocol/reseed/data/r9-whitelist.json b/protocol/reseed/data/r9-whitelist.json
@@ -206,7 +206,7 @@
       "0xc84c7727",
       "1",
       "10000",
-      "0",
+      "0x5fbc",
       "0",
       "0x01",
       "0",
@@ -246,7 +246,7 @@
       "0xc84c7727",
       "1",
       "10000",
-      "0",
+      "0x5fbc",
       "0",
       "0x01",
       "0",
@@ -283,7 +283,7 @@
     "0xBEA00dAf62D5549D265c5cA6D6BE87eF17881279",
     "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
     [
-      "0x00000000",
+      "0xc84c7727",
       "0x1",
       "0x2540be400",
       "0x5525",
@@ -326,7 +326,7 @@
       "0xc84c7727",
       "1",
       "10000",
-      "0",
+      "0x5fbc",
       "0",
       "0x01",
       "0",

diff --git a/protocol/reseed/dataConverts/convertWhitelist.js b/protocol/reseed/dataConverts/convertWhitelist.js
@@ -93,18 +93,6 @@ const tokensToWhitelist = [
   "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",
@@ -186,6 +174,19 @@ const tokenToGpAndOptimalPercentDepositedBdvMapping = {
 function parseWhitelist(inputFilePath, outputFilePath) {
   try {
     const data = JSON.parse(fs.readFileSync(inputFilePath, "utf8"));
+
+    const defaultAssetSettings = {
+      selector: "0xc84c7727",
+      stalkEarnedPerSeason: "1",
+      stalkIssuedPerBdv: "10000000000",
+      milestoneSeason: data.season.current,
+      milestoneStem: "0",
+      encodeType: "0x01",
+      deltaStalkEarnedPerSeason: "0",
+      gaugePoints: "0",
+      optimalPercentDepositedBdv: "0"
+    };
+
     const assetSettings = data.silo.assetSettings;
     const output = {};
 

diff --git a/protocol/reseed/reseed9.js b/protocol/reseed/reseed9.js
@@ -22,7 +22,13 @@ async function reseed9(account, L2Beanstalk, mock = false) {
   let oracles = assets.map((asset) => asset[4]);
 
   // deploy LSD chainlink oracle for whitelist:
-  await deployContract("LSDChainlinkOracle", account, true, []);
+  const LSDChainlinkOracle = await deployContract("LSDChainlinkOracle", account, true, []);
+  console.log("LSDChainlinkOracle deployed at:", LSDChainlinkOracle.address);
+
+  // modify oracles for token 4 (WSTETH) and token 5 (WEETH) to use LSDChainlinkOracle address.
+  oracles[4][0] = LSDChainlinkOracle.address;
+  oracles[5][0] = LSDChainlinkOracle.address;
+
 
   await upgradeWithNewFacets({
     diamondAddress: L2Beanstalk,

diff --git a/protocol/reseed/reseedAddLiquidityAndTransfer.js b/protocol/reseed/reseedAddLiquidityAndTransfer.js
@@ -7,7 +7,7 @@ const {
   L2_USDC,
   L2_USDT
 } = require("../test/hardhat/utils/constants.js");
-const { to18, to6 } = require("../test/hardhat/utils/helpers.js");
+const { to18, to6, toX } = require("../test/hardhat/utils/helpers.js");
 const { impersonateToken } = require("../scripts/impersonate.js");
 const fs = require("fs");
 
@@ -36,20 +36,20 @@ async function reseedAddLiquidityAndTransfer(account, L2Beanstalk, mock = true,
   );
 
   const nonBeanAmounts = [
-    balancesInBeanEthWell[1], // BEAN/WETH
-    balancesInBeanWstEthWell[1], // BEAN/WstETH
-    to18("1000"), // BEAN/WEEETH
-    to18("1"), // BEAN/WBTC
-    balancesInBeanStableWell[1], // BEAN/USDC
-    to6("100000") // BEAN/USDT
+    to18("100"), // BEAN/WETH
+    to18("100"), // BEAN/WstETH
+    to18("1500"), // BEAN/WEEETH
+    toX("20", 8), // BEAN/WBTC (8 decimals)
+    to6("1000000"), // BEAN/USDC
+    to6("1000000") // BEAN/USDT
   ];
 
   const beanAmounts = [
-    balancesInBeanEthWell[0], // BEAN/WETH
-    balancesInBeanWstEthWell[0], // BEAN/WstETH
+    to6("1000000"), // BEAN/WETH
+    to6("1000000"), // BEAN/WstETH
     to6("1000000"), // BEAN/WEEETH
-    to6("100000000000000000"), // BEAN/WBTC
-    to6("1000000000000"), // BEAN/USDC
+    to6("1000000"), // BEAN/WBTC
+    to6("1000000"), // BEAN/USDC
     to6("1000000") // BEAN/USDT
   ];
   console.log("-----------------------------------");