diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh index 8f999d1fffb5d5..aee99d0e6ce540 100755 --- a/ci/publish-tarball.sh +++ b/ci/publish-tarball.sh @@ -64,6 +64,7 @@ echo --- Creating tarball cargo install --path . --features=cuda --root ../solana-release-cuda ) cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda + cp -a scripts multinode-demo solana-release/ tar jvcf solana-release-$TARGET.tar.bz2 solana-release/ cp solana-release/bin/solana-install solana-install-$TARGET diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh index 2bd1ac5baf7144..b7c933d26a81ed 100644 --- a/multinode-demo/common.sh +++ b/multinode-demo/common.sh @@ -21,7 +21,8 @@ if [[ $(uname) != Linux ]]; then fi fi -if [[ -n $USE_INSTALL ]]; then # Assume |./scripts/cargo-install-all.sh| was run + +if [[ -n $USE_INSTALL || ! -f "$(dirname "${BASH_SOURCE[0]}")"/../Cargo.toml ]]; then solana_program() { declare program="$1" printf "solana-%s" "$program" diff --git a/net/net.sh b/net/net.sh index 0dd384dc21f595..fd0a2646527ee1 100755 --- a/net/net.sh +++ b/net/net.sh @@ -411,7 +411,7 @@ stopNode() { pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]') sudo kill -- -\$pgid done - for pattern in solana- remote-; do + for pattern in node solana- remote-; do pkill -9 \$pattern done " diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh index 0036e449a96e42..58cb8a0fd53e14 100755 --- a/net/remote/remote-node.sh +++ b/net/remote/remote-node.sh @@ -118,6 +118,13 @@ local|tar) fi if [[ $nodeType = blockstreamer ]]; then + # Sneak the mint-id.json from the bootstrap leader and run another drone + # with it on the blockstreamer node. Typically the blockstreamer node has + # a static IP/DNS name for hosting the blockexplorer web app, and is + # a location that somebody would expect to be able to airdrop from + scp "$entrypointIp":~/solana/config-local/mint-id.json config-local/ + ./multinode-demo/drone.sh > drone.log 2>&1 & + npm install @solana/blockexplorer@1 npx solana-blockexplorer > blockexplorer.log 2>&1 &