gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
automerge
This commit is contained in:
Tyera Eulberg
2019-09-10 17:16:40 -06:00
committed by Grimes
parent 008dcd71b9
commit c62a4a1c13
15 changed files with 809 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/solana-install-deploy.sh
View File

@ -72,10 +72,10 @@ PATH="$SOLANA_ROOT"/target/debug:$PATH
set -x
# shellcheck disable=SC2086 # Don't want to double quote $maybeKeypair
balance=$(solana $maybeKeypair --url "$URL" balance)
balance=$(solana $maybeKeypair --url "$URL" balance --lamports)
if [[ $balance = "0 lamports" ]]; then
# shellcheck disable=SC2086 # Don't want to double quote $maybeKeypair
solana $maybeKeypair --url "$URL" airdrop 42
solana $maybeKeypair --url "$URL" airdrop 42 lamports
fi
# shellcheck disable=SC2086 # Don't want to double quote $maybeKeypair

6
scripts/wallet-sanity.sh
View File

@ -63,11 +63,11 @@ fi
$solana_cli "${entrypoint[@]}" address
check_balance_output "0 lamports"
$solana_cli "${entrypoint[@]}" airdrop 600
$solana_cli "${entrypoint[@]}" airdrop 600 lamports
check_balance_output "600 lamports"
$solana_cli "${entrypoint[@]}" airdrop 400
$solana_cli "${entrypoint[@]}" airdrop 400 lamports
check_balance_output "1000 lamports"
pay_and_confirm $garbage_address 50
pay_and_confirm $garbage_address 50 lamports
check_balance_output "lamports" # <-- exact number of lamports here depends on the current cluster fees
echo PASS