Merge branch 'reseed-final-fixes' into update-reseed-whitelist-json

BeanstalkFarms · Sep 14, 2024 · bb6bbec · bb6bbec
2 parents 7bb1ab6 + 72fa75e
commit bb6bbec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -134,13 +134,13 @@
       "16000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]
@@ -174,13 +174,13 @@
       "26000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]
@@ -214,13 +214,13 @@
       "14000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]
@@ -254,13 +254,13 @@
       "20000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]
@@ -294,13 +294,13 @@
       "12000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]
@@ -334,13 +334,13 @@
       "12000000",
       [
         "0x0000000000000000000000000000000000000000",
-        "0x2c5fa218",
+        "0xe4b8d822",
         "0x00",
         "0x00"
       ],
       [
         "0x0000000000000000000000000000000000000000",
-        "0xe4b8d822",
+        "0x2c5fa218",
         "0x00",
         "0x00"
       ]