Skip to content
Open
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 dappnode_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"upstream": [
{
"repo": "dappnode/staker-package-scripts",
"version": "v0.1.0",
"version": "v0.1.2",
"arg": "STAKER_SCRIPTS_VERSION"
}
],
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ services:
build:
context: shutter
args:
UPSTREAM_VERSION: v1.3.13
UPSTREAM_VERSION: v1.4.0
KEYPER_CONFIG_DIR: /keyper/config
SHUTTER_CHAIN_DIR: /chain
STAKER_SCRIPTS_VERSION: v0.1.0
STAKER_SCRIPTS_VERSION: v0.1.2
restart: unless-stopped
environment:
- SHUTTER_API_NODE_PRIVATEKEY=""
Expand All @@ -32,7 +32,7 @@ services:
metrics:
build:
context: metrics
restart: on-failure
restart: unless-stopped
environment:
SHUTTER_PUSH_METRICS_ENABLED: true
KEYPER_NAME: ""
Expand Down
10 changes: 6 additions & 4 deletions shutter/scripts/configure_keyper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ NODE_PATH=$NODE_HOME/lib/node_modules
PATH=$NODE_HOME/bin:$PATH

function test_ethereum_url() {
# FIXME: This is a workaround for the issue with the staker-scripts@v0.1.1 not setting get_execution_ws_url_from_global_env correctly in the environment variables.
# Git Issue: https://github.com/dappnode/staker-package-scripts/issues/11
export SHUTTER_NETWORK_NODE_ETHEREUMURL=${ETHEREUM_WS:-$(get_execution_ws_url_from_global_env ${NETWORK} ${SUPPORTED_NETWORKS})}
if [ -z "$ETHEREUM_WS" ]; then
export SHUTTER_NETWORK_NODE_ETHEREUMURL=$(get_execution_ws_url_from_global_env ${NETWORK})
else
export SHUTTER_NETWORK_NODE_ETHEREUMURL=$ETHEREUM_WS
fi
RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
if [[ $RESULT =~ '"id":1' ]]; then return 0; else
export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8545
export SHUTTER_NETWORK_NODE_ETHEREUMURL=ws://execution.${NETWORK}.dncore.dappnode:8545 # fallback to old URL
RESULT=$(wscat -c "$SHUTTER_NETWORK_NODE_ETHEREUMURL" -x '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id": 1}')
if [[ $RESULT =~ '"id":1' ]]; then return 0; else
echo "Could not find DAppNode RPC/WS url for this package!"
Expand Down
Loading