Interpret Solana-CLI amount requests in SOL by default (#5866)

automerge

multinode-demo/delegate-stake.sh

@@ -95,7 +95,7 @@ fi
 
 if ((airdrops_enabled)); then
   declare fees=100 # TODO: No hardcoded transaction fees, fetch the current cluster fees
-  $solana_cli "${common_args[@]}" airdrop $((stake_lamports+fees))
+  $solana_cli "${common_args[@]}" airdrop $((stake_lamports+fees)) lamports
 fi
 
 $solana_keygen new -o "$stake_keypair_path"
@@ -104,6 +104,5 @@ set -x
 $solana_cli "${common_args[@]}" \
   show-vote-account "$vote_keypair_path"
 $solana_cli "${common_args[@]}" \
-  delegate-stake $maybe_force "$stake_keypair_path" "$vote_keypair_path" "$stake_lamports"
+  delegate-stake $maybe_force "$stake_keypair_path" "$vote_keypair_path" "$stake_lamports" lamports
 $solana_cli "${common_args[@]}" show-stake-account "$stake_keypair_path"
-

multinode-demo/replicator.sh

@@ -63,7 +63,7 @@ if [[ ! -r $identity_keypair ]]; then
 
   # TODO: https://github.com/solana-labs/solminer/blob/9cd2289/src/replicator.js#L17-L18
   $solana_cli --keypair "$identity_keypair" --url "$rpc_url" \
-      airdrop 100000
+      airdrop 100000 lamports
 fi
 identity_pubkey=$($solana_keygen pubkey "$identity_keypair")
 

multinode-demo/validator.sh

@@ -273,11 +273,11 @@ setup_validator_accounts() {
     echo "Adding $node_lamports to validator identity account:"
     (
       declare fees=100 # TODO: No hardcoded transaction fees, fetch the current cluster fees
-      wallet airdrop $((node_lamports+fees))
+      wallet airdrop $((node_lamports+fees)) lamports
     ) || return $?
   else
     echo "Validator identity account balance:"
-    wallet balance || return $?
+    wallet balance --lamports || return $?
   fi
 
   if ! wallet show-vote-account "$voting_keypair_path"; then