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.

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

chore: allow full zetaclient config overlay #2945

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ contrib/localnet/addresses.txt

# Config for e2e tests
e2e_conf*
contrib/localnet/scripts/extra-evm-chains.json
contrib/localnet/scripts/zetaclient-config-overlay.json
6 changes: 3 additions & 3 deletions contrib/localnet/scripts/start-zetaclientd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ then
fi
fi

# merge extra-evm-chains.json into zetaclient_config.json if specified
if [[ -f /root/extra-evm-chains.json ]]; then
jq '.EVMChainConfigs *= input' /root/.zetacored/config/zetaclient_config.json /root/extra-evm-chains.json > /tmp/merged_config.json
# merge zetaclient-config-overlay.json into zetaclient_config.json if specified
if [[ -f /root/zetaclient-config-overlay.json ]]; then
jq -s '.[0] * .[1]' /root/.zetacored/config/zetaclient_config.json /root/zetaclient-config-overlay.json > /tmp/merged_config.json
lumtis marked this conversation as resolved.
Show resolved Hide resolved
lumtis marked this conversation as resolved.
Show resolved Hide resolved
mv /tmp/merged_config.json /root/.zetacored/config/zetaclient_config.json
fi

Expand Down
Loading