Revert "Add a stand-alone gossip node on the blocksteamer instance"

This reverts commit a217920561.

This commit is causing trouble when the TdS cluster is reset and
validators running an older genesis config are still present.
Occasionally an RPC URL from an older validator will be selected,
causing a new node to fail to boot.

net/net.sh

@@ -501,7 +501,6 @@ startBootstrapLeader() {
     ssh "${sshOptions[@]}" -n "$ipAddress" \
       "./solana/net/remote/remote-node.sh \
          $deployMethod \
-         $ipAddress \
          bootstrap-leader \
          $entrypointIp \
          $((${#validatorIpList[@]} + ${#blockstreamerIpList[@]} + ${#archiverIpList[@]})) \
@@ -571,7 +570,6 @@ startNode() {
     ssh "${sshOptions[@]}" -n "$ipAddress" \
       "./solana/net/remote/remote-node.sh \
          $deployMethod \
-         $ipAddress \
          $nodeType \
          $entrypointIp \
          $((${#validatorIpList[@]} + ${#blockstreamerIpList[@]} + ${#archiverIpList[@]})) \

net/remote/remote-node.sh

@@ -5,28 +5,27 @@ cd "$(dirname "$0")"/../..
 
 set -x
 deployMethod="$1"
-ipAddress="$2"
-nodeType="$3"
-entrypointIp="$4"
-numNodes="$5"
-if [[ -n $6 ]]; then
-  export RUST_LOG="$6"
+nodeType="$2"
+entrypointIp="$3"
+numNodes="$4"
+if [[ -n $5 ]]; then
+  export RUST_LOG="$5"
 fi
-skipSetup="$7"
-failOnValidatorBootupFailure="$8"
-externalPrimordialAccountsFile="$9"
-maybeDisableAirdrops="${10}"
-internalNodesStakeLamports="${11}"
-internalNodesLamports="${12}"
-nodeIndex="${13}"
-numBenchTpsClients="${14}"
-benchTpsExtraArgs="${15}"
-numBenchExchangeClients="${16}"
-benchExchangeExtraArgs="${17}"
-genesisOptions="${18}"
-extraNodeArgs="${19}"
-gpuMode="${20:-auto}"
-GEOLOCATION_API_KEY="${21}"
+skipSetup="$6"
+failOnValidatorBootupFailure="$7"
+externalPrimordialAccountsFile="$8"
+maybeDisableAirdrops="$9"
+internalNodesStakeLamports="${10}"
+internalNodesLamports="${11}"
+nodeIndex="${12}"
+numBenchTpsClients="${13}"
+benchTpsExtraArgs="${14}"
+numBenchExchangeClients="${15}"
+benchExchangeExtraArgs="${16}"
+genesisOptions="${17}"
+extraNodeArgs="${18}"
+gpuMode="${19:-auto}"
+GEOLOCATION_API_KEY="${20}"
 set +x
 
 missing() {
@@ -35,7 +34,6 @@ missing() {
 }
 
 [[ -n $deployMethod ]]  || missing deployMethod
-[[ -n $ipAddress ]]     || missing ipAddress
 [[ -n $nodeType ]]      || missing nodeType
 [[ -n $entrypointIp ]]  || missing entrypointIp
 [[ -n $numNodes ]]      || missing numNodes
@@ -278,22 +276,18 @@ EOF
     fi
 
     args=(
+      --entrypoint "$entrypointIp:8001"
+      --gossip-port 8001
       --rpc-port 8899
     )
     if [[ $nodeType = blockstreamer ]]; then
       args+=(
-        --entrypoint "$ipAddress:8001"
-        --gossip-port 9001
+        --blockstream /tmp/solana-blockstream.sock
         --no-voting
         --dev-no-sigverify
-        --blockstream /tmp/solana-blockstream.sock
       )
     else
-      args+=(
-        --entrypoint "$entrypointIp:8001"
-        --gossip-port 8001
-        --enable-rpc-exit
-      )
+      args+=(--enable-rpc-exit)
       if [[ -n $internalNodesLamports ]]; then
         args+=(--node-lamports "$internalNodesLamports")
       fi
@@ -363,11 +357,6 @@ EOF
 
 cat >> ~/solana/on-reboot <<EOF
       ~/solana/restart-explorer
-      echo --- Starting gossip spy node
-      ln -sfT gossip.log.\$now gossip.log
-      nohup solana-gossip spy --gossip-port 8001 --gossip-host "$ipAddress" --entrypoint $entrypointIp:8001 > gossip.log.\$now 2>&1 &
-      sleep 1
-      head gossip.log
 EOF
     fi