Create bench exchange accounts in genesis block (#4655)

* fix script

* review comments

net/net.sh

@@ -567,7 +567,7 @@ start() {
     if [[ $i -lt "$numBenchTpsClients" ]]; then
       startClient "${clientIpList[$i]}" "solana-bench-tps" "$i"
     else
-      startClient "${clientIpList[$i]}" "solana-bench-exchange" "$i"
+      startClient "${clientIpList[$i]}" "solana-bench-exchange" $((i-numBenchTpsClients))
     fi
   done
   clientDeployTime=$SECONDS

net/remote/remote-client.sh

@@ -70,6 +70,8 @@ solana-bench-tps)
   ;;
 solana-bench-exchange)
   solana-keygen new -f -o bench.keypair
+  net/scripts/rsync-retry.sh -vPrc \
+    "$entrypointIp":~/solana/solana-client-accounts/bench-exchange"$clientIndex".yml ./client-accounts.yml
   clientCommand="\
     solana-bench-exchange \
       --entrypoint $entrypointIp:8001 \
@@ -80,6 +82,7 @@ solana-bench-exchange)
       --duration 7500 \
       --identity bench.keypair \
       $benchExchangeExtraArgs \
+      --read-client-keys ./client-accounts.yml \
   "
   ;;
 *)

net/remote/remote-node.sh

@@ -103,16 +103,19 @@ local|tar)
       tail -n +2 -q ./solana-client-accounts/bench-tps"$i".yml >> ./solana-client-accounts/client-accounts.yml
       echo "" >> ./solana-client-accounts/client-accounts.yml
     done
-    for i in $(seq "$numBenchTpsClients" "$numBenchExchangeClients"); do
+    for i in $(seq 0 $((numBenchExchangeClients-1))); do
       # shellcheck disable=SC2086 # Do not want to quote $benchExchangeExtraArgs
-      echo $benchExchangeExtraArgs
-#      solana-bench-exchange -w ./solana-client-accounts/bench-exchange"$i".yml $benchExchangeExtraArgs
-#      tail -n +2 -q ./solana-client-accounts/bench-exchange"$i".yml >> ./solana-client-accounts/client-accounts.yml
+      solana-bench-exchange --batch-size 1000 --fund-amount 20000 \
+        --write-client-keys ./solana-client-accounts/bench-exchange"$i".yml $benchExchangeExtraArgs
+      tail -n +2 -q ./solana-client-accounts/bench-exchange"$i".yml >> ./solana-client-accounts/client-accounts.yml
+      echo "" >> ./solana-client-accounts/client-accounts.yml
     done
     [[ -z $externalPrimordialAccountsFile ]] || cat "$externalPrimordialAccountsFile" >> ./solana-node-stakes/fullnode-stakes.yml
     if [ -f ./solana-node-stakes/fullnode-stakes.yml ]; then
-      genesisOptions+=" --primordial-accounts-file ./solana-node-stakes/fullnode-stakes.yml \
-        --primordial-keypairs-file ./solana-client-accounts/client-accounts.yml"
+      genesisOptions+=" --primordial-accounts-file ./solana-node-stakes/fullnode-stakes.yml"
+    fi
+    if [ -f ./solana-client-accounts/client-accounts.yml ]; then
+      genesisOptions+=" --primordial-keypairs-file ./solana-client-accounts/client-accounts.yml"
     fi
     if [[ $skipSetup != true ]]; then
       args=(