Merge remote-tracking branch 'origin/master' into beanstalk-3-merge-m…

…isc-bip

.github/workflows/ci.protocol.yaml

@@ -1,5 +1,4 @@
 name: Protocol
-
 on:
   pull_request:
     types: [opened, synchronize]
@@ -31,22 +30,38 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - name: Protocol Tests
         uses: actions/setup-node@v3
         with:
           node-version: "18"
+
       - name: Cache Node Modules
         id: node-modules-cache
         uses: actions/cache@v3
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+
       - name: Install Dependencies
         if: steps.node-modules-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
       - run: yarn generate
         working-directory: protocol
-      - run: yarn test
+
+      - name: Clear cache and reinstall on generate failure
+        if: steps.generate-with-cache.outcome == 'failure' && steps.node-modules-cache.outputs.cache-hit == 'true'
+        run: |
+          rm -rf **/node_modules
+          yarn install --no-immutable
+
+      - name: Generate (after potential cache clear)
+        if: steps.generate-with-cache.outcome == 'failure'
+        run: yarn generate
+        working-directory: protocol
+
+      - name: Run tests
+        run: yarn test
         env:
           FORKING_RPC: ${{ secrets.ANVIL_FORK_URL }}
         working-directory: protocol

.github/workflows/ci.subgraph-basin.yaml

@@ -44,7 +44,7 @@ jobs:
         run: echo "There are uncommitted changes - execute 'yarn codegen' locally and commit the generated files!"
 
       - name: Build Subgraph
-        run: yarn build
+        run: yarn build -- ethereum
         working-directory: projects/subgraph-basin
   test:
     runs-on: ubuntu-latest

.github/workflows/ci.subgraph-bean.yaml

@@ -44,7 +44,7 @@ jobs:
         run: echo "There are uncommitted changes - execute 'yarn codegen' locally and commit the generated files!"
 
       - name: Build Subgraph
-        run: yarn build
+        run: yarn build -- ethereum
         working-directory: projects/subgraph-bean
   test:
     runs-on: ubuntu-latest

.github/workflows/ci.subgraph-beanft.yaml

@@ -44,7 +44,7 @@ jobs:
         run: echo "There are uncommitted changes - execute 'yarn codegen' locally and commit the generated files!"
 
       - name: Build Subgraph
-        run: yarn build
+        run: yarn build -- ethereum
         working-directory: projects/subgraph-beanft
   test:
     runs-on: ubuntu-latest

.github/workflows/ci.subgraph-beanstalk.yaml

@@ -44,7 +44,7 @@ jobs:
         run: echo "There are uncommitted changes - execute 'yarn codegen' locally and commit the generated files!"
 
       - name: Build Subgraph
-        run: yarn build
+        run: yarn build -- ethereum
         working-directory: projects/subgraph-beanstalk
   test:
     runs-on: ubuntu-latest

projects/cli/src/commands/balance.ts

@@ -3,7 +3,9 @@ import { table } from "table";
 
 export const balance = async (sdk, { account, symbol }) => {
   console.log(`${chalk.bold.whiteBright("Account:")} ${chalk.greenBright(account)}`);
-  let res = [[chalk.bold("Token"), chalk.bold("Internal"), chalk.bold("External"), chalk.bold("Total")]];
+  let res = [
+    [chalk.bold("Token"), chalk.bold("Internal"), chalk.bold("External"), chalk.bold("Total")]
+  ];
 
   if (symbol) {
     res.push(await getBal(sdk, symbol, account));
@@ -18,7 +20,7 @@ export const balance = async (sdk, { account, symbol }) => {
         "DAI",
         "CRV3",
         "UNRIPE_BEAN",
-        "UNRIPE_BEAN_WETH",
+        "UNRIPE_BEAN_wstETH",
         "BEAN_CRV3_LP",
         "BEAN_ETH_WELL_LP",
         "ROOT"

projects/cli/src/commands/setbalance.ts

@@ -11,15 +11,30 @@ export const setbalance = async (sdk, chain, { account, symbol, amount }) => {
   if (!symbol) {
     await chain.setAllBalances(account, amount);
   } else {
-    const symbols = ["ETH", "WETH", "BEAN", "USDT", "USDC", "DAI", "CRV3", "BEAN3CRV", "BEANWETH", "urBEAN", "urBEANWETH", "ROOT"];
+    const symbols = [
+      "ETH",
+      "WETH",
+      "BEAN",
+      "USDT",
+      "USDC",
+      "DAI",
+      "CRV3",
+      "BEAN3CRV",
+      "BEANWETH",
+      "urBEAN",
+      "urBEANwstETH",
+      "ROOT"
+    ];
     if (!symbols.includes(symbol)) {
-      console.log(`${chalk.bold.red("Error")} - ${chalk.bold.white(symbol)} is not a valid token. Valid options are: `);
+      console.log(
+        `${chalk.bold.red("Error")} - ${chalk.bold.white(symbol)} is not a valid token. Valid options are: `
+      );
       console.log(symbols.map((s) => chalk.green(s)).join(", "));
       process.exit(-1);
     }
     let t = sdk.tokens[symbol] as Token;
     if (symbol === "urBEAN") t = sdk.tokens.UNRIPE_BEAN;
-    if (symbol === "urBEANWETH") t = sdk.tokens.UNRIPE_BEAN_WETH;
+    if (symbol === "urBEANwstETH") t = sdk.tokens.UNRIPE_BEAN_WSTETH;
     if (symbol === "BEAN3CRV") t = sdk.tokens.BEAN_CRV3_LP;
     if (symbol === "BEANWETH") t = sdk.tokens.BEAN_ETH_WELL_LP;
     if (typeof chain[`set${symbol}Balance`] !== "function")

projects/cli/src/commands/sunrise.ts

@@ -16,6 +16,7 @@ export const sunrise = async (sdk, chain, { force }) => {
   }
 
   await callSunrise(sdk);
+  await sdk.provider.send("evm_mine", []);
 
   if (diff > 1) {
     console.log(`You are still behind by ${diff - 1} seasons. May need to call it again.`);
@@ -27,7 +28,9 @@ async function callSunrise(sdk: BeanstalkSDK) {
     const res = await sdk.contracts.beanstalk.sunrise();
     await res.wait();
     const season = await sdk.contracts.beanstalk.season();
-    console.log(`${chalk.bold.greenBright("sunrise()")} called. New season is ${chalk.bold.yellowBright(season)}`);
+    console.log(
+      `${chalk.bold.greenBright("sunrise()")} called. New season is ${chalk.bold.yellowBright(season)}`
+    );
   } catch (err: any) {
     console.log(`sunrise() call failed: ${err.reason}`);
   }