Update contracts list, merkles, tests

protocol/contracts/beanstalk/migration/L1RecieverFacet.sol

@@ -40,13 +40,13 @@ contract L1RecieverFacet is ReentrancyGuard {
 
     // todo: update with correct merkle roots once once L1 Beanstalk has been paused.
     bytes32 internal constant DEPOSIT_MERKLE_ROOT =
-        0x53d64bba5389504aeff2d680bd0d5a4a27f7c535578915ccfbc64f4aef1656ee;
+        0xe8c85107aea17dd6d4330a7a996c8ec23d62aa22f3feb4c97cdd5368e1fa756b;
     bytes32 internal constant PLOT_MERKLE_ROOT =
-        0x828c73c8e073801828c564f95bafd55c6a0485f244d4581e638c90ca678d3a28;
+        0x8d60edfd9ab5f687b1d92f441b577b43d2ad8cb22e66779e6c37e3dc3b91f3e1;
     bytes32 internal constant INTERNAL_BALANCE_MERKLE_ROOT =
-        0x0ed5cf8908ddecd7d9285e5809315d007bfd5bd6d71f4c7db1131569180d23e2;
+        0x3b6f4a3ceb1dc34f3a00414b79dcc5c16756093de2e4062e726ec22afd36741c;
     bytes32 internal constant FERTILIZER_MERKLE_ROOT =
-        0xa6e5ea73ff65d2f3378d95a7ce19b7226756100026ac0d29a79a71591e22b8f9;
+        0x6329fea484065f1f62d989fbf443406e3487276c4397ad36e0370f60ffbaa2e5;
     // bytes32 internal constant POD_ORDER_MERKLE_ROOT =
     // 0x4a000e44e0820fdb1ef4194538de1404629221d77e7c920fa8c000ce5902d503;
 

protocol/foundry.toml

@@ -42,6 +42,7 @@ ignored_warnings_from = [
 gas_reports = ['*']
 # Cache to `$HOME/.foundry/cache/<chain id>/<block number>`.
 no_storage_caching = false
+no_match_contract = "ReseedStateTest"
 
 [profile.differential]
 match_test = "testDiff"

protocol/reseed/data/r2/L2_external_unripe_balances.json

@@ -1,8 +1,4 @@
 [
-  [
-    "0xc1e088fc1323b20bcbee9bd1b9fc9546db5624c5",
-    "107919824635094"
-  ],
   [
     "0x9f64674cab93986254c6329c4521c4f9737af864",
     "412635026949"

protocol/reseed/data/r2/L2_external_unripe_lp_balances.json

@@ -1,8 +1,4 @@
 [
-  [
-    "0xc1e088fc1323b20bcbee9bd1b9fc9546db5624c5",
-    "68338152592140"
-  ],
   [
     "0x1085057e6d9ad66e73d3cc788079155660264152",
     "203120992714"

protocol/reseed/data/r2/L2_well_balances.json

@@ -1,5 +1,14 @@
 [
-  ["107380655868", "20582720189638019906"],
-  ["14544578478380", "2361659050325418670234"],
-  ["83855245277", "20668624046092866087554"]
-]
+  [
+    "107380655868",
+    "20582720189638019906"
+  ],
+  [
+    "14544578478380",
+    "2361659050325418670234"
+  ],
+  [
+    "83855245277",
+    "20668624046092866087554"
+  ]
+]

protocol/reseed/reseedL2.js

@@ -144,8 +144,11 @@ async function printStage(i, end, mock, log) {
 }
 
 function parseBeanstalkData() {
-  // TODO: Replace with actual smart contract accounts.
-  const contractAccounts = ["0x1", "0x2", "0x3", "0x4", "0x5"];
+  const contractAccounts = fs
+    .readFileSync("./scripts/beanstalk-3/data/inputs/ContractAddresses.txt", "utf8")
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
   const BLOCK_NUMBER = 20736200;
   const storageAccountsPath = `./reseed/data/exports/storage-accounts${BLOCK_NUMBER}.json`;
   const storageFertPath = `./reseed/data/exports/storage-fertilizer${BLOCK_NUMBER}.json`;
@@ -179,7 +182,7 @@ function parseBeanstalkData() {
     contractAccounts
   );
   // Initial supplies and well balances
-  const reserveSupplyJsonPath = `./reseed/data/exports/contract-circulating${BLOCK_NUMBER}.json`
+  const reserveSupplyJsonPath = `./reseed/data/exports/contract-circulating${BLOCK_NUMBER}.json`;
   const outputFilePaths = {
     L2_initial_supply: "./reseed/data/r2/L2_initial_supply.json",
     L2_well_balances: "./reseed/data/r2/L2_well_balances.json"

protocol/scripts/beanstalk-3/data/inputs/ContractAddresses.txt

@@ -1,47 +1,71 @@
-0x7bf4b9d4ec3b9aab1f00dad63ea58389b9f68909
-0xdd9f24efc84d93deef3c8745c837ab63e80abd27
-0x9008d19f58aabd9ed0d60971565aa8510560ab41
-0xb1be0000c6b3c62749b5f0c92480146452d15423
-0x9662c8e686fe84f468a139b10769d65665c344f9
-0xe37e799d5077682fa0a244d46e5649f71457bd09
-0x92f3f71cef740ed5784874b8c70ff87ecdf33588
-0x0b3f6d4a5d6835137ccb2c1248f5a7d882c0dbda
-0x5fba3e7eeeb50a4dc3328e2f974e0d608b38913e
 0x00000000009726632680fb29d3f7a9734e3010e2
-0x20db9f8c46f9cd438bfd65e09297350a8cdb0f95
-0xaa420e97534ab55637957e868b658193b112a551
-0x7e04231a59c9589d17bcf2b0614bc86ad5df7c11
-0x8525664820c549864982d4965a41f83a7d26af58
+0x0245934a930544c7046069968eb4339b03addfcf
+0x0b3f6d4a5d6835137ccb2c1248f5a7d882c0dbda
+0x1111111254eeb25477b68fb85ed929f73a960582
+0x1125eac5f713503e2b7cb2299027960ce1aa5d42
 0x1136b25047e142fa3018184793aec68fbb173ce4
-0xa9febe780f9ede9b424f5ce7da88d650f2d55498
+0x11dd6f9e1a7bb35a61fada4aec645f603050783e
+0x153072c11d6dffc0f1e5489bc7c996c219668c67
+0x20db9f8c46f9cd438bfd65e09297350a8cdb0f95
+0x21de18b6a8f78ede6d16c50a167f6b222dc08df7
+0x22a956c4755d8c4294b358dc346e74250e175622
+0x23ed1e6384705dfd23788d5093266c0d9ebe3fae
+0x251fae8f687545bdd462ba4fcdd7581051740463
+0x25c1278454254f783ef8760987db8de0268c6cbe
+0x2d0ba6af26c6738feaacb6d85da29d3fadda1706
+0x3208684f96458c540eb08f6f01b9e9afb2b7d4f0
 0x3aa228a80f50763045bdfc45012da124bd0a6809
+0x3f9208f556735504e985ff1a369af2e8ff6240a3
+0x3face0004bc1003b9d0672e7b23134cb80115fb6
+0x4a183b7ed67b9e14b3f45abfb2cf44ed22c29e54
+0x515e6fa10473a20098aba9659238a90892310c16
+0x517b37dc73f756192b318d3853bd4c66ba4b41cb
+0x54c04c9bf5af0bc3096cb0af24c4fa8379a2915e
+0x5eefd9c64d8c35142b7611ae3a6decfc6d7a8a5e
+0x5fba3e7eeeb50a4dc3328e2f974e0d608b38913e
+0x66efac6e6d58d4058cf017e66a0039315a3eb29c
+0x7119f398b6c06095c6e8964c1f58e7c1baa79e18
 0x7122db0ebe4eb9b434a9f2ffe6760bc03bfbd0e0
-0x81b9cfcb1dc180acaf7c187db5fe2c961f74d67e
 0x735cab9b02fd153174763958ffb4e0a971dd7f29
-0x2d0ba6af26c6738feaacb6d85da29d3fadda1706
+0x75a158b6939d9abc27b5e3ea9e79c11302cec60c
+0x77700005bea4de0a78b956517f099260c2ca9a26
+0x7bf4b9d4ec3b9aab1f00dad63ea58389b9f68909
+0x7c28e0977f72c5d08d5e1ac7d52a34db378282b3
+0x7e04231a59c9589d17bcf2b0614bc86ad5df7c11
+0x81b9cfcb1dc180acaf7c187db5fe2c961f74d67e
+0x83a758a6a24fe27312c1f8bda7f3277993b64783
+0x8525664820c549864982d4965a41f83a7d26af58
+0x88ba4ca3e197105062d8bdbd0647cfd69bab3af9
+0x8d97775623368f833f8fa82209e220f1c60508ea
+0x9008d19f58aabd9ed0d60971565aa8510560ab41
+0x905eafe9434fabacaf10d1490fcd0d1eb9b85fc8
+0x92f3f71cef740ed5784874b8c70ff87ecdf33588
+0x9662c8e686fe84f468a139b10769d65665c344f9
+0x99bfdb688d53891d6e9e716eace90fa233a83500
+0x9a37cef306b26c46178f345ef7a51790c33933cb
+0x9edaff6744d6f539298cddd8c0171b774be2b86d
+0x9f15de1a169d3073f8fba8de79e4ba519b19c64d
+0xa9febe780f9ede9b424f5ce7da88d650f2d55498
+0xaa420e97534ab55637957e868b658193b112a551
+0xae319acf9dc6e952dc456fa9b65dab0865d6457b
 0xb01f8f528702d411d24c9bb8cc0e2fff779ec013
+0xb1be0000c6b3c62749b5f0c92480146452d15423
 0xb9f14efae1d14b6d06816b6e3a5f6e79c87232fa
-0x21de18b6a8f78ede6d16c50a167f6b222dc08df7
-0x153072c11d6dffc0f1e5489bc7c996c219668c67
-0x4a183b7ed67b9e14b3f45abfb2cf44ed22c29e54
-0x1111111254eeb25477b68fb85ed929f73a960582
-0x251fae8f687545bdd462ba4fcdd7581051740463
-0x23ed1e6384705dfd23788d5093266c0d9ebe3fae
+0xbc7c5f21c632c5c7ca1bfde7cbff96254847d997
+0xbd3af41fca3511a04ad195de502318e625401a93
+0xbea0000113b0d182f4064c86b71c315389e4715d
+0xbea0e11282e2bb5893bece110cf199501e872bad
+0xc1e088fc1323b20bcbee9bd1b9fc9546db5624c5
 0xc1fe2bb036e3fc9eddcc83304dbe752881087cdf
-0x5eefd9c64d8c35142b7611ae3a6decfc6d7a8a5e
-0x1c694fc3006d81ff4a56f97e1b99529066a23725
 0xc5a7f91ac0b24ca8957a97aacab4fc1022e256f5
-0x77700005bea4de0a78b956517f099260c2ca9a26
-0x7119f398b6c06095c6e8964c1f58e7c1baa79e18
-0x25c1278454254f783ef8760987db8de0268c6cbe
-0xbc7c5f21c632c5c7ca1bfde7cbff96254847d997
-0x517b37dc73f756192b318d3853bd4c66ba4b41cb
-0x3f9208f556735504e985ff1a369af2e8ff6240a3
-0x75a158b6939d9abc27b5e3ea9e79c11302cec60c
-0x9edaff6744d6f539298cddd8c0171b774be2b86d
-0x66efac6e6d58d4058cf017e66a0039315a3eb29c
-0x83a758a6a24fe27312c1f8bda7f3277993b64783
 0xc9c32cd16bf7efb85ff14e0c8603cc90f6f2ee49
-0xbea0e11282e2bb5893bece110cf199501e872bad
+0xdd9f24efc84d93deef3c8745c837ab63e80abd27
+0xdf9c4a067279857b463817ef773fe189c77e1686
+0xe2dc368cf962426efa08b60c9570b19618b5e672
+0xe37e799d5077682fa0a244d46e5649f71457bd09
+0xe4000004000bd8006e00720000d27d1fa000d43e
+0xe6b1de575e7e610889ea21024834e120f92033a3
+0xea3154098a58eebfa89d705f563e6c5ac924959e
+0xf0d4c12a5768d806021f80a262b4d39d26c58b8d
 0xf2d47e78dea8e0f96902c85902323d2a2012b0c0
-0x7c28e0977f72c5d08d5e1ac7d52a34db378282b3
+0xf33332d233de8b6b1340039c9d5f3b2a04823d93

protocol/scripts/beanstalk-3/data/inputs/Deposits.json

@@ -1,4 +1,19 @@
 [
+  [
+    "0x0245934a930544C7046069968eB4339B03adDFcf",
+    [
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543000000000000000000000000",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffff96227bb80"
+    ],
+    [
+      "1",
+      "2"
+    ],
+    [
+      "0",
+      "1"
+    ]
+  ],
   [
     "0x153072C11d6Dffc0f1e5489bC7C996c219668c67",
     [
@@ -755,6 +770,21 @@
       "322518265"
     ]
   ],
+  [
+    "0x88Ba4ca3e197105062D8bDBd0647cFd69bab3Af9",
+    [
+      "0xbea00a3f7aaf99476862533fe7dca4b50f6158cb000000000000000006f94740",
+      "0xbea0005b8599265d41256905a9b3073d397812e400000000000000087d50b645"
+    ],
+    [
+      "5494238473",
+      "14345780"
+    ],
+    [
+      "670895123",
+      "14345780"
+    ]
+  ],
   [
     "0x9662C8E686fe84F468a139b10769D65665c344F9",
     [
@@ -767,6 +797,27 @@
       "1"
     ]
   ],
+  [
+    "0x9f15DE1a169D3073f8fBA8de79E4BA519b19C64D",
+    [
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffffb6bd0a780",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffff9b510b540",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffffad4a85d80",
+      "0xbea0005b8599265d41256905a9b3073d397812e400000000000000087d50b645"
+    ],
+    [
+      "1",
+      "2852385621950",
+      "4",
+      "11618891700"
+    ],
+    [
+      "1",
+      "651175766561",
+      "1",
+      "11618891700"
+    ]
+  ],
   [
     "0xa9FeBE780f9EdE9b424f5cE7DA88D650f2D55498",
     [
@@ -782,6 +833,21 @@
       "3833702"
     ]
   ],
+  [
+    "0xae319Acf9dC6E952DC456fa9b65DAB0865D6457b",
+    [
+      "0xbea00a3f7aaf99476862533fe7dca4b50f6158cb000000000000000046461cc0",
+      "0xbea0005b8599265d41256905a9b3073d397812e400000000000000087d50b645"
+    ],
+    [
+      "1479817877",
+      "5145652"
+    ],
+    [
+      "177344666",
+      "5145652"
+    ]
+  ],
   [
     "0xB9F14eFae1D14b6d06816B6E3a5F6e79c87232fA",
     [
@@ -856,5 +922,71 @@
       "2548209128",
       "13123785430"
     ]
+  ],
+  [
+    "0xea3154098a58eEbfA89d705F563E6C5Ac924959e",
+    [
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff78aebbf00",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff7a787f700",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff83f675c00",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff82ae65600",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff822cb2400",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff800390b00",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff83c4de700",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff7d1bb3000",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff824766300",
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff81e437900",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffffc763f7100",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffffc361cfc00",
+      "0xbea0005b8599265d41256905a9b3073d397812e400000000000000087d50b645"
+    ],
+    [
+      "1287974785",
+      "5586111125",
+      "1119973477",
+      "2221371219",
+      "4751838190",
+      "422717612",
+      "183457426",
+      "131933118",
+      "2280787324",
+      "4024063537",
+      "20008000000",
+      "2",
+      "15"
+    ],
+    [
+      "283981702",
+      "1231664911",
+      "246939597",
+      "489783486",
+      "1047718570",
+      "93203740",
+      "40449978",
+      "29089538",
+      "502883966",
+      "887253717",
+      "4453497382",
+      "1",
+      "15"
+    ]
+  ],
+  [
+    "0xF33332D233de8B6B1340039c9d5f3B2A04823D93",
+    [
+      "0x1bea059c3ea15f6c10be1c53d70c75fd1266d788fffffffffffffff86512ea00",
+      "0x1bea054dddbca12889e07b3e076f511bf1d27543fffffffffffffffc361cfc00",
+      "0xbea0005b8599265d41256905a9b3073d397812e400000000000000087d50b645"
+    ],
+    [
+      "11942733951",
+      "381866055",
+      "169027378"
+    ],
+    [
+      "2204299878",
+      "70860854",
+      "169027378"
+    ]
   ]
 ]

protocol/scripts/beanstalk-3/data/inputs/Fertilizers.json

@@ -47,6 +47,16 @@
     ],
     "340802"
   ],
+  [
+    "0xea3154098a58eEbfA89d705F563E6C5Ac924959e",
+    [
+      "6000000"
+    ],
+    [
+      "3180"
+    ],
+    "340802"
+  ],
   [
     "0x21DE18B6A8f78eDe6D16C50A167f6B222DC08DF7",
     [