Fetch and install SPL programs by default

This commit is contained in:
Michael Vines 2020-07-29 11:05:19 -07:00
parent 8eb6cbf784
commit 3a1ca4efff
6 changed files with 76 additions and 1 deletions

4
.gitignore vendored
View File

@ -23,3 +23,7 @@ log-*/
/.idea/
/solana.iml
/.vscode/
# fetch-spl.sh artifacts
/spl-genesis-args.sh
/spl_*.so

50
fetch-spl.sh Executable file
View File

@ -0,0 +1,50 @@
#!/usr/bin/env bash
#
# Fetches the latest SPL programs and produces the solana-genesis command-line
# arguments needed to install them
#
set -e
fetch_program() {
declare name=$1
declare version=$2
declare address=$3
declare so=spl_$name-$version.so
genesis_args+=(--bpf-program "$address" "$so")
if [[ -r $so ]]; then
return
fi
if [[ -r ~/.cache/solana-spl/$so ]]; then
cp ~/.cache/solana-spl/"$so" "$so"
else
echo "Downloading $name $version"
(
set -x
curl -L --retry 5 --retry-delay 2 --retry-connrefused \
-o "$so" \
"https://github.com/solana-labs/solana-program-library/releases/download/$name-v$version/spl_$name.so"
)
mkdir -p ~/.cache/solana-spl
cp "$so" ~/.cache/solana-spl/"$so"
fi
}
fetch_program token 1.0.0 TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
fetch_program memo 1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo
echo "${genesis_args[@]}" > spl-genesis-args.sh
echo
echo "Available SPL programs:"
ls -l spl_*.so
echo
echo "solana-genesis command-line arguments (spl-genesis-args.sh):"
cat spl-genesis-args.sh

View File

@ -33,9 +33,19 @@ args=(
"$SOLANA_CONFIG_DIR"/bootstrap-validator/vote-account.json
"$SOLANA_CONFIG_DIR"/bootstrap-validator/stake-account.json
)
"$SOLANA_ROOT"/fetch-spl.sh
if [[ -r spl-genesis-args.sh ]]; then
SPL_GENESIS_ARGS=$(cat "$SOLANA_ROOT"/spl-genesis-args.sh)
#shellcheck disable=SC2207
#shellcheck disable=SC2206
args+=($SPL_GENESIS_ARGS)
fi
default_arg --ledger "$SOLANA_CONFIG_DIR"/bootstrap-validator
default_arg --faucet-pubkey "$SOLANA_CONFIG_DIR"/faucet.json
default_arg --faucet-lamports 500000000000000000
default_arg --hashes-per-tick auto
default_arg --operating-mode development
$solana_genesis "${args[@]}"

View File

@ -221,7 +221,7 @@ syncScripts() {
declare ipAddress=$1
rsync -vPrc -e "ssh ${sshOptions[*]}" \
--exclude 'net/log*' \
"$SOLANA_ROOT"/{fetch-perf-libs.sh,scripts,net,multinode-demo} \
"$SOLANA_ROOT"/{fetch-perf-libs.sh,fetch-spl.sh,scripts,net,multinode-demo} \
"$ipAddress":~/solana/ > /dev/null
}

6
run.sh
View File

@ -63,6 +63,11 @@ fi
if [[ -e "$ledgerDir"/genesis.bin || -e "$ledgerDir"/genesis.tar.bz2 ]]; then
echo "Use existing genesis"
else
./fetch-spl.sh
if [[ -r spl-genesis-args.sh ]]; then
SPL_GENESIS_ARGS=$(cat spl-genesis-args.sh)
fi
# shellcheck disable=SC2086
solana-genesis \
--hashes-per-tick sleep \
@ -74,6 +79,7 @@ else
"$dataDir"/validator-stake-account.json \
--ledger "$ledgerDir" \
--operating-mode development \
$SPL_GENESIS_ARGS \
$SOLANA_RUN_SH_GENESIS_ARGS
fi

View File

@ -24,6 +24,11 @@ rm -rf usr/
scripts/cargo-install-all.sh sdk/docker-solana/usr
cp -f ../../run.sh usr/bin/solana-run.sh
cp -f ../../fetch-spl usr/bin/
(
cd usr/bin
./fetch-spl.sh
)
docker build -t solanalabs/solana:"$CHANNEL_OR_TAG" .