Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop using JSON spec files in runtime #375

Merged
merged 1 commit into from
Jul 13, 2024
Merged

Stop using JSON spec files in runtime #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,4 @@ jobs:
files: |
linux_x86_build
mainnet-${{github.ref_name}}.wasm
bastiat-${{github.ref_name}}.wasm
substrate/specs/bastiat.raw.json
substrate/specs/mainnet.raw.json
bastiat-${{github.ref_name}}.wasm
3 changes: 1 addition & 2 deletions Dockerfile-prebuilt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ EXPOSE 30333 9933 9944
VOLUME /data
RUN useradd -Ms /bin/bash liberland
COPY --from=downloader /app/node /node
COPY substrate/specs /specs
RUN mkdir /data && chown liberland:liberland -R /specs /node /data && chmod +x /node
RUN mkdir /data && chown liberland:liberland -R /node /data && chmod +x /node
USER liberland
ENTRYPOINT [ "/node" ]
3 changes: 1 addition & 2 deletions Dockerfile-source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ FROM debian:buster-slim AS runtime
EXPOSE 30333 9933 9944
VOLUME /data
COPY --from=builder /app/target/release/substrate /node
COPY substrate/specs /specs
RUN useradd -Ms /bin/bash liberland
RUN mkdir /data && chown liberland:liberland -R /specs /node /data
RUN mkdir /data && chown liberland:liberland -R /node /data
USER liberland
ENTRYPOINT [ "/node" ]
45 changes: 18 additions & 27 deletions substrate/scripts/install/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ set -euo pipefail

sudo_cmd=""
arch=""
chain_spec_exists=""
chain_spec_url="null"
network="null"
release_info=""
keychain_exists=""
session_keys=""
Expand Down Expand Up @@ -66,25 +65,23 @@ release_info=$(mktemp)
curl -Ls https://api.github.com/repos/liberland/liberland_substrate/releases/latest -o $release_info
echo "OK ($(jq -r .name < $release_info))"

if [ -e "/opt/liberland/chain_spec.raw.json" ]; then
echo "Existing /opt/liberland/chain_spec.raw.json detected - skipping chain selection, will only update node binary."
chain_spec_exists=1
if [ -e "/opt/liberland/NETWORK" ]; then
network=$(cat /opt/liberland/NETWORK)
echo "Existing install detected - skipping chain selection, using '$network'."
else
chain_spec_exists=0
chain_specs="$(jq -r '.assets[] | select(.name | endswith(".raw.json")) | .name' < $release_info)"
while [ "$chain_spec_url" == "null" ]; do
while [ "$network" == "null" ]; do
networks=("bastiat" "mainnet")
echo "Available networks: "
i=0
for spec in $chain_specs; do
name="${spec%.raw.json}"
echo "$i) ${name^}"
(( i++ )) || true
for idx in ${!networks[@]}; do
name="${networks[$idx]}"
echo "$idx) ${name^}"
done
echo -n "Select number: "
read chain_spec_idx < /dev/tty
chain_spec_url="$(jq -r ".assets | map(select(.name | endswith(\".raw.json\"))) | .[$chain_spec_idx].browser_download_url" < $release_info)"
read network_idx < /dev/tty
network="${networks[$network_idx]}"
done
fi

node_url="$(jq -r ".assets[] | select(.name == \"linux_x86_build\") | .browser_download_url" < $release_info)"
rm $release_info

Expand All @@ -96,15 +93,11 @@ fi

echo "Everything's ready. Tasks:"
echo " [X] Download $node_url -> /usr/local/bin/liberland-node"
if [ $chain_spec_exists -eq 0 ]; then
echo " [X] Download $chain_spec_url -> /opt/liberland/chain_spec.raw.json"
else
echo " [ ] Chain spec already exists, so won't be changed."
fi
echo " [X] Generate systemd service liberland-node.service to autorun on boot."
echo " [X] Configure to use $network network"
echo " [X] Generate systemd service liberland-validator.service to autorun on boot."
echo " [X] Enable NTP time synchronization."
if [ $keychain_exists -eq 0 ]; then
echo " [X] Generate new session keys and store them in node"
echo " [X] Generate new session keys and store them in the node"
else
echo " [ ] Data dir already exists, so session keys won't be regenerated."
fi
Expand All @@ -120,10 +113,8 @@ $sudo_cmd systemctl stop liberland-validator &>/dev/null || true
echo "Download binary..."
$sudo_cmd curl -sSL $node_url -o /usr/local/bin/liberland-node
$sudo_cmd chmod +x /usr/local/bin/liberland-node
if [ $chain_spec_exists -eq 0 ]; then
echo "Download chain spec..."
$sudo_cmd curl -sSL $chain_spec_url -o /opt/liberland/chain_spec.raw.json
fi
echo "Configure network..."
echo $network | $sudo_cmd tee /opt/liberland/NETWORK >/dev/null
echo "Generate liberland-validator.service..."
$sudo_cmd tee /etc/systemd/system/liberland-validator.service >/dev/null << EOF
[Unit]
Expand All @@ -132,7 +123,7 @@ After=network.target

[Service]
Type=simple
ExecStart=/usr/local/bin/liberland-node -d /opt/liberland/data --chain /opt/liberland/chain_spec.raw.json --validator
ExecStart=/usr/local/bin/liberland-node -d /opt/liberland/data --chain $network --validator
Restart=on-failure
RestartSec=5m

Expand Down