Merge remote-tracking branch 'origin/unstable' into tree-states

scripts/cli.sh

@@ -2,7 +2,7 @@
 
 # IMPORTANT
 # This script should NOT be run directly.
-# Run `make cli` from the root of the repository instead.
+# Run `make cli` or `make cli-local` from the root of the repository instead.
 
 set -e
 
@@ -90,7 +90,7 @@ rm -f help_general.md help_bn.md help_vc.md help_am.md help_vm.md help_vm_create
 
 # only exit at the very end
 if [[ $changes == true ]]; then
-    echo "Exiting with error to indicate changes occurred..."
+    echo "Exiting with error to indicate changes occurred. To fix, run `make cli-local` or `make cli` and commit the changes."
     exit 1
 else
     echo "CLI help texts are up to date."

scripts/local_testnet/README.md

@@ -187,10 +187,9 @@ Update the genesis time to now using:
 1. Add builder URL to `BN_ARGS` in `./vars.env`, e.g. `--builder http://localhost:8650`. Some mock builder server options: 
     - [`mock-relay`](https://github.com/realbigsean/mock-relay)
     - [`dummy-builder`](https://github.com/michaelsproul/dummy_builder)
-2. (Optional) Add `--always-prefer-builder-payload` to `BN_ARGS`.
-3. The above mock builders do not support non-mainnet presets as of now, and will require setting `SECONDS_PER_SLOT` and `SECONDS_PER_ETH1_BLOCK` to `12` in `./vars.env`. 
-4. Start the testnet with the following command (the `-p` flag enables the validator client `--builder-proposals` flag):
+2. The above mock builders do not support non-mainnet presets as of now, and will require setting `SECONDS_PER_SLOT` and `SECONDS_PER_ETH1_BLOCK` to `12` in `./vars.env`. 
+3. Start the testnet with the following command (the `-p` flag enables the validator client `--builder-proposals` flag):
     ```bash
     ./start_local_testnet.sh -p genesis.json
     ```
-5. Block production using builder flow will start at epoch 4.
+4. Block production using builder flow will start at epoch 4.