The fullnode identity keypair can now be provided via --identity (#4228)

automerge

multinode-demo/extra-fullnode-args.sh

@@ -16,6 +16,7 @@ extra_fullnode_args=()
 stake=43 # number of lamports to assign as stake (plus transaction fee to setup the stake)
 poll_for_new_genesis_block=0
 label=
+fullnode_id_path=
 
 while [[ ${1:0:1} = - ]]; do
   if [[ $1 = --label ]]; then
@@ -28,6 +29,10 @@ while [[ ${1:0:1} = - ]]; do
     stake=0
     extra_fullnode_args+=("$1" "$2")
     shift 2
+  elif [[ $1 = --identity ]]; then
+    fullnode_id_path=$2
+    args+=("$1" "$2")
+    shift 2
   elif [[ $1 = --enable-rpc-exit ]]; then
     extra_fullnode_args+=("$1")
     shift

multinode-demo/fullnode.sh

@@ -9,6 +9,7 @@ source "$here"/common.sh
 # shellcheck source=scripts/oom-score-adj.sh
 source "$here"/../scripts/oom-score-adj.sh
 
+
 # shellcheck source=multinode-demo/extra-fullnode-args.sh
 source "$here"/extra-fullnode-args.sh
 
@@ -41,8 +42,8 @@ else
   program=$solana_fullnode
 fi
 
-fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id$label.json
-fullnode_vote_id_path=$SOLANA_CONFIG_DIR/fullnode-vote-id$label.json
+: "${fullnode_id_path:=$SOLANA_CONFIG_DIR/fullnode-keypair$label.json}"
+fullnode_vote_id_path=$SOLANA_CONFIG_DIR/fullnode-vote-keypair$label.json
 ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger$label
 accounts_config_dir=$SOLANA_CONFIG_DIR/fullnode-accounts$label
 
@@ -55,8 +56,8 @@ fullnode_vote_id=$($solana_keygen pubkey "$fullnode_vote_id_path")
 
 cat <<EOF
 ======================[ Fullnode configuration ]======================
-node id: $fullnode_id
-vote id: $fullnode_vote_id
+node pubkey: $fullnode_id
+vote pubkey: $fullnode_vote_id
 ledger: $ledger_config_dir
 accounts: $accounts_config_dir
 ======================================================================