Always use bootstrap vote account for leader

multinode-demo/bootstrap-leader.sh

@@ -15,7 +15,6 @@ if [[ $1 = -h ]]; then
 fi
 
 extra_fullnode_args=()
-setup_stakes=true
 
 while [[ ${1:0:1} = - ]]; do
   if [[ $1 = --blockstream ]]; then
@@ -27,9 +26,6 @@ while [[ ${1:0:1} = - ]]; do
   elif [[ $1 = --init-complete-file ]]; then
     extra_fullnode_args+=("$1" "$2")
     shift 2
-  elif [[ $1 = --only-bootstrap-stake ]]; then
-    setup_stakes=false
-    shift
   elif [[ $1 = --public-address ]]; then
     extra_fullnode_args+=("$1")
     shift
@@ -85,8 +81,4 @@ $program \
 pid=$!
 oom_score_adj "$pid" 1000
 
-if [[ $setup_stakes = true ]] ; then
-  setup_fullnode_staking 127.0.0.1 "$bootstrap_leader_id_path" "$bootstrap_leader_staker_id_path"
-fi
-
 wait "$pid"

multinode-demo/setup.sh

@@ -79,6 +79,7 @@ if $bootstrap_leader; then
     $solana_keygen -o "$SOLANA_CONFIG_DIR"/bootstrap-leader-staker-id.json
     $solana_genesis \
       --bootstrap-leader-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json \
+      --bootstrap-stake-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-staker-id.json \
       --ledger "$SOLANA_RSYNC_CONFIG_DIR"/ledger \
       --mint "$SOLANA_CONFIG_DIR"/mint-id.json \
       --lamports "$lamports"