From f6901a6501c70dc92de20bc3709e6062a0e38ffc Mon Sep 17 00:00:00 2001 From: Sebastian <379651+czarly@users.noreply.github.com> Date: Wed, 20 Mar 2024 06:17:31 +0100 Subject: [PATCH] fixed? --- path-blacklist.txt | 1 + upstreams.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/path-blacklist.txt b/path-blacklist.txt index 5084a2fe..ab8375d6 100644 --- a/path-blacklist.txt +++ b/path-blacklist.txt @@ -1,5 +1,6 @@ lighthouse prism +prysm beacon nimbus ws diff --git a/upstreams.sh b/upstreams.sh index 8fba39a5..a95a68ef 100755 --- a/upstreams.sh +++ b/upstreams.sh @@ -3,7 +3,7 @@ BASEPATH="$(dirname "$0")" source $BASEPATH/.env -$LOCAL=${1:-false} +LOCAL=${1:-false} IFS=':' read -ra parts <<< $COMPOSE_FILE @@ -41,20 +41,22 @@ for part in "${parts[@]}"; do if $path_include; then - if [ "$LOCAL" = "true" ]; then - url=$(./get-local-name.sh "${part%.yml}") + if $LOCAL; then + url=$("$BASEPATH/get-local-url.sh" "${part%.yml}") + TEST_URL="https://$DOMAIN$path" export RPC_URL="http://$url" export WS_URL="ws://$url" + export ID=$(echo "$DOMAIN$path" | sed -E 's/^rpc-(.*)\.stakesquid\.eu\/(.*)$/\1-\2/') else url="$DOMAIN$path" export RPC_URL="https://$url" export WS_URL="wss://$url" + export ID=$(echo "$url" | sed -E 's/^rpc-(.*)\.stakesquid\.eu\/(.*)$/\1-\2/') fi - export ID=$(echo "$url" | sed -E 's/^rpc-(.*)\.stakesquid\.eu\/(.*)$/\1-\2/') export PROVIDER=${ORGANIZATION}-${ID} - chain_id=$(curl --ipv4 -m 1 -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":1}' $RPC_URL | jq -r '.result') + chain_id=$(curl --ipv4 -m 1 -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":1}' $TEST_URL | jq -r '.result') chain_id_decimal=$((16#${chain_id#0x})) export CHAIN=$($BASEPATH/get-shortname.sh $chain_id_decimal)