client changes for TODOs and looping (#1138)

* remove client.sh from snap
* default to ephemeral instead of ~/.config key
* rework CLI for bench-tps
* remote multinode-demo stuff from remote-client.sh
* remove multinode-demo from remote-sanity and localnet-sanity

net/remote/remote-client.sh

@@ -32,16 +32,8 @@ snap)
   sudo snap install solana.snap --devmode --dangerous
   rm solana.snap
 
-  nodeConfig="\
-    leader-ip=$entrypointIp \
-    default-metrics-rate=1 \
-    metrics-config=$SOLANA_METRICS_CONFIG \
-    rust-log=$RUST_LOG \
-  "
-  # shellcheck disable=SC2086 # Don't want to double quote "$nodeConfig"
-  sudo snap set solana $nodeConfig
-
   solana_bench_tps=/snap/bin/solana.bench-tps
+  solana_keygen=/snap/bin/solana.keygen
   ;;
 local)
   PATH="$HOME"/.cargo/bin:"$PATH"
@@ -50,7 +42,8 @@ local)
   export RUST_LOG
 
   rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
-  solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana $entrypointIp:8001"
+  solana_bench_tps=solana-bench-tps
+  solana_keygen=solana-keygen
   ;;
 *)
   echo "Unknown deployment method: $deployMethod"
@@ -62,7 +55,13 @@ scripts/oom-monitor.sh > oom-monitor.log 2>&1 &
 ! tmux list-sessions || tmux kill-session
 
 clientCommand="$solana_bench_tps --num-nodes $numNodes --seconds 600 --sustained --threads $threadCount"
+keygenCommand="$solana_keygen -o client.id"
 tmux new -s solana-bench-tps -d "
+  [[ -r client.json ]] || {
+    echo '$ $keygenCommand' >> client.log
+    $keygenCommand >> client.log 2>&1
+  }
+
   while true; do
     echo === Client start: \$(date) >> client.log
     $metricsWriteDatapoint 'testnet-deploy client-begin=1'

net/remote/remote-sanity.sh

@@ -51,22 +51,27 @@ case $deployMethod in
 snap)
   PATH="/snap/bin:$PATH"
   export USE_SNAP=1
+  entrypointRsyncUrl="$entrypointIp"
 
   solana_bench_tps=solana.bench-tps
   solana_ledger_tool=solana.ledger-tool
-  ledger=/var/snap/solana/current/config/ledger
+  solana_keygen=solana.keygen
+
+  ledger=/var/snap/solana/current/config/ledger
+  client_id=/var/snap/solana/current/config/client-id.json
 
-  entrypointRsyncUrl="$entrypointIp"
   ;;
 local)
   PATH="$HOME"/.cargo/bin:"$PATH"
   export USE_INSTALL=1
-
   entrypointRsyncUrl="$entrypointIp:~/solana"
 
-  solana_bench_tps="multinode-demo/client.sh $entrypointRsyncUrl $entrypointIp:8001"
+  solana_bench_tps=solana-bench-tps
   solana_ledger_tool=solana-ledger-tool
+  solana_keygen=solana-keygen
+
   ledger=config/ledger
+  client_id=config/client-id.json
   ;;
 *)
   echo "Unknown deployment method: $deployMethod"
@@ -83,7 +88,8 @@ echo "--- $entrypointIp: wallet sanity"
 echo "--- $entrypointIp: node count"
 (
   set -x
-  $solana_bench_tps --num-nodes "$numNodes" --converge-only
+  [[ -r $client_id ]] || $solana_keygen -o "$client_id"
+  $solana_bench_tps --network "$entrypointIp:8001" --identity "$client_id" --num-nodes "$numNodes" --converge-only
 )
 
 echo "--- $entrypointIp: verify ledger"
@@ -128,4 +134,3 @@ else
   echo "^^^ +++"
   echo "Validator sanity disabled (NO_VALIDATOR_SANITY defined)"
 fi
-