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

Add |wallet reset| command

Browse Source
This commit is contained in:
Michael Vines
2018-07-02 17:08:39 -07:00
committed by Grimes
parent 9ae283dc3a
commit e09b8430ce
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
multinode-demo/client.sh
View File

@ -6,7 +6,6 @@
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-client
leader=${1:-${here}/..} # Default to local solana repo leader=${1:-${here}/..} # Default to local solana repo
count=${2:-1} count=${2:-1}
@ -14,11 +13,11 @@ count=${2:-1}
rsync_leader_url=$(rsync_url "$leader") rsync_leader_url=$(rsync_url "$leader")
set -ex set -ex
mkdir -p "$SOLANA_CONFIG_DIR" mkdir -p "$SOLANA_CONFIG_CLIENT_DIR"
$rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_DIR"/ $rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_CLIENT_DIR"/
$rsync -vPz "$rsync_leader_url"/config-private/mint.json "$SOLANA_CONFIG_DIR"/ $rsync -vPz "$rsync_leader_url"/config-private/mint.json "$SOLANA_CONFIG_CLIENT_DIR"/
# shellcheck disable=SC2086 # $solana_client_demo should not be quoted # shellcheck disable=SC2086 # $solana_client_demo should not be quoted
exec $solana_client_demo \ exec $solana_client_demo \
-n "$count" -l "$SOLANA_CONFIG_DIR"/leader.json \ -n "$count" -l "$SOLANA_CONFIG_CLIENT_DIR"/leader.json \
< "$SOLANA_CONFIG_DIR"/mint.json < "$SOLANA_CONFIG_CLIENT_DIR"/mint.json

1
multinode-demo/common.sh
View File

@ -60,6 +60,7 @@ export RUST_BACKTRACE=1
SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-$PWD}/config-client-client
rsync_url() { # adds the 'rsync://` prefix to URLs that need it rsync_url() { # adds the 'rsync://` prefix to URLs that need it
declare url="$1" declare url="$1"

3
multinode-demo/test/wallet-sanity.sh
View File

@ -22,8 +22,7 @@ check_balance_output() {
} }
# Ensure a fresh client configuration every time # Ensure a fresh client configuration every time
rm -rf config-client $wallet reset
$wallet address $wallet address
check_balance_output "No account found! Request an airdrop to get started" check_balance_output "No account found! Request an airdrop to get started"
$wallet airdrop --tokens 100 $wallet airdrop --tokens 100

22
multinode-demo/wallet.sh
View File

@ -6,10 +6,9 @@
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-client
# if $1 isn't host:path, something.com, or a valid local path # if $1 isn't host:path, something.com, or a valid local path
if [[ ${1%:} != "$1" || "$1" =~ [^.].[^.] || -d $1 ]]; then if [[ ${1%:} != "$1" || "$1" =~ [^.]\.[^.] || -d $1 ]]; then
leader=$1 # interpret leader=$1 # interpret
shift shift
else else
@ -20,15 +19,24 @@ else
fi fi
fi fi
if [[ "$1" = "reset" ]]; then
echo Wallet resetting
rm -rf "$SOLANA_CONFIG_CLIENT_DIR"
exit 0
fi
rsync_leader_url=$(rsync_url "$leader") rsync_leader_url=$(rsync_url "$leader")
set -e set -e
mkdir -p "$SOLANA_CONFIG_DIR" mkdir -p "$SOLANA_CONFIG_CLIENT_DIR"
if [[ ! -r "$SOLANA_CONFIG_DIR"/leader.json ]]; then if [[ ! -r "$SOLANA_CONFIG_CLIENT_DIR"/leader.json ]]; then
$rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_DIR"/ (
set -x
$rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_CLIENT_DIR"/
)
fi fi
client_json="$SOLANA_CONFIG_DIR"/client.json client_json="$SOLANA_CONFIG_CLIENT_DIR"/client.json
if [[ ! -r $client_json ]]; then if [[ ! -r $client_json ]]; then
$solana_mint <<<0 > "$client_json" $solana_mint <<<0 > "$client_json"
fi fi
@ -36,4 +44,4 @@ fi
set -x set -x
# shellcheck disable=SC2086 # $solana_wallet should not be quoted # shellcheck disable=SC2086 # $solana_wallet should not be quoted
exec $solana_wallet \ exec $solana_wallet \
-l "$SOLANA_CONFIG_DIR"/leader.json -m "$client_json" "$@" -l "$SOLANA_CONFIG_CLIENT_DIR"/leader.json -m "$client_json" "$@"