Skip to content

Commit

Permalink
fix: case insensitive compare addresses
Browse files Browse the repository at this point in the history
  • Loading branch information
vgorkavenko committed Oct 28, 2024
1 parent fb43783 commit 1084772
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ethd
Original file line number Diff line number Diff line change
Expand Up @@ -3296,7 +3296,7 @@ __query_lido_obol_cluster_definition() {
${__as_owner} curl -o ./.eth/cluster_definition.tmp -s "${__cluster_definition_url}" -H "Accept: application/json"
# shellcheck disable=SC2086
__cluster_definition_is_valid=$(__docompose -f ./lido-obol.yml run --rm -v "$(pwd)"/.eth/cluster_definition.tmp:/cluster_definition.json:ro curl-jq sh -c \
"cat /cluster_definition.json | jq -r 'all(.validators[]; .fee_recipient_address == \"'${FEE_RECIPIENT}'\" and .withdrawal_address == \"'$(__lido_withdrawal_credentials_address)'\")'" | tail -n 1)
"cat /cluster_definition.json | jq -r 'all(.validators[]; ascii_downcase(.fee_recipient_address) == ascii_downcase(\"'${FEE_RECIPIENT}'\") and ascii_downcase(.withdrawal_address) == ascii_downcase(\"'$(__lido_withdrawal_credentials_address)'\"))'" | tail -n 1)
set -e
if [ "${__cluster_definition_is_valid}" = "true" ]; then
echo "Your cluster definition url is:" "${__cluster_definition_url}"
Expand Down Expand Up @@ -3588,7 +3588,7 @@ config() {
if (whiptail --title "Lido Obol cluster exists" --yesno "Your cluster has already been created. Continue with it?" 10 60); then
# shellcheck disable=SC2086
__cluster_lock_is_valid=$(__docompose -f ./lido-obol.yml run --rm -v "$(pwd)"/.eth/cluster-lock.json:/cluster-lock.json:ro curl-jq sh -c \
"cat /cluster-lock.json | jq -r 'all(.cluster_definition.validators[]; .fee_recipient_address == \"'${FEE_RECIPIENT}'\" and .withdrawal_address == \"'$(__lido_withdrawal_credentials_address)'\")'" | tail -n 1)
"cat /cluster-lock.json | jq -r 'all(.cluster_definition.validators[]; (.fee_recipient_address | ascii_downcase) == (\"'${FEE_RECIPIENT}'\" | ascii_downcase) and (.withdrawal_address | ascii_downcase) == (\"'$(__lido_withdrawal_credentials_address)'\" | ascii_downcase))'" | tail -n 1)
if [[ "${__cluster_lock_is_valid}" =~ "true" ]]; then
echo "Your cluster lock is valid."
else
Expand Down Expand Up @@ -3624,7 +3624,7 @@ config() {
if (whiptail --title "Lido Obol cluster creation in process" --yesno "You already have cluster definition. Use it?" 10 60); then
# shellcheck disable=SC2086
__cluster_definition_is_valid=$(__docompose -f ./lido-obol.yml run --rm -v "$(pwd)"/.eth/cluster-definition.json:/cluster-definition.json:ro curl-jq sh -c \
"cat /cluster-definition.json | jq -r 'all(.validators[]; .fee_recipient_address == \"'${FEE_RECIPIENT}'\" and .withdrawal_address == \"'$(__lido_withdrawal_credentials_address)'\")'" | tail -n 1)
"cat /cluster-definition.json | jq -r 'all(.validators[]; (.fee_recipient_address | ascii_downcase) == (\"'${FEE_RECIPIENT}'\" | ascii_downcase) and (.withdrawal_address | ascii_downcase) == (\"'$(__lido_withdrawal_credentials_address)'\" | ascii_downcase))'" | tail -n 1)
if [ "${__cluster_definition_is_valid}" = "true" ]; then
echo "Your cluster definition is valid."
else
Expand Down

0 comments on commit 1084772

Please sign in to comment.