From e045b18cb57bbef1355a05dfe9563b3cefda15c7 Mon Sep 17 00:00:00 2001 From: mrekucci <4932785+mrekucci@users.noreply.github.com> Date: Mon, 19 Feb 2024 20:14:48 -0300 Subject: [PATCH] fix: issues reported by shellcheck --- geth-poa/util/deploy_create2.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/geth-poa/util/deploy_create2.sh b/geth-poa/util/deploy_create2.sh index 197ff8b5f2..d9e557b733 100755 --- a/geth-poa/util/deploy_create2.sh +++ b/geth-poa/util/deploy_create2.sh @@ -7,7 +7,7 @@ set -e # Use the first command line argument, if provided. Otherwise, use the environment variable. JSON_RPC="${1:-$JSON_RPC_URL}" -if [ -z "$JSON_RPC" ]; then +if [ -z "${JSON_RPC}" ]; then echo "Usage: $0 or set the JSON_RPC_URL environment variable." exit 1 fi @@ -19,13 +19,13 @@ fi # Check if contract already deployed DATA='{"jsonrpc":"2.0","method":"eth_getCode","params":["0x4e59b44847b379578588920ca78fbf26c0b4956c", "latest"],"id":1}' -RESPONSE=$(curl -s -X POST --data "$DATA" -H "Content-Type: application/json" $JSON_RPC) -CODE=$(echo $RESPONSE | jq -r '.result') -if [ -z "$RESPONSE" ] || [ "$RESPONSE" == "null" ]; then - echo "Error: No response from JSON RPC at $JSON_RPC" +RESPONSE=$(curl -s -X POST --data "${DATA}" -H "Content-Type: application/json" "${JSON_RPC}") +CODE=$(echo "${RESPONSE}" | jq -r '.result') +if [ -z "${RESPONSE}" ] || [ "${RESPONSE}" = "null" ]; then + echo "Error: No response from JSON RPC at ${JSON_RPC}" exit 1 fi -if [ "$CODE" != "0x" ]; then +if [ "${CODE}" != "0x" ]; then echo "Contract already deployed at 0x4e59b44847b379578588920ca78fbf26c0b4956c" exit 0 else @@ -38,12 +38,12 @@ fi TRANSACTION="0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222" # deploy contract -curl $JSON_RPC -X 'POST' -H 'Content-Type: application/json' --data "{\"jsonrpc\":\"2.0\", \"id\":1, \"method\": \"eth_sendRawTransaction\", \"params\": [\"$TRANSACTION\"]}" +curl -s "${JSON_RPC}" -X 'POST' -H 'Content-Type: application/json' --data "{\"jsonrpc\":\"2.0\", \"id\":1, \"method\": \"eth_sendRawTransaction\", \"params\": [\"$TRANSACTION\"]}" sleep 5 # For prod we'll have to set gas params s.t. no ether is leftover here. For now we warn -RESPONSE=$(curl -s -X POST --data '{"jsonrpc":"2.0","method":"eth_getBalance","params":["0x3fab184622dc19b6109349b94811493bf2a45362", "latest"],"id":1}' -H "Content-Type: application/json" $JSON_RPC) -if [ $(echo $RESPONSE | jq -r '.result') != "0x0" ]; then - echo "WARNING: Deployment signer (0x3fab184622dc19b6109349b94811493bf2a45362) has leftover balance of $(echo $RESPONSE | jq -r '.result') wei" +RESPONSE=$(curl -s -X POST --data '{"jsonrpc":"2.0","method":"eth_getBalance","params":["0x3fab184622dc19b6109349b94811493bf2a45362", "latest"],"id":1}' -H "Content-Type: application/json" "${JSON_RPC}") +if [ "$(echo "${RESPONSE}" | jq -r '.result')" != "0x0" ]; then + echo "WARNING: Deployment signer (0x3fab184622dc19b6109349b94811493bf2a45362) has leftover balance of $(echo "${RESPONSE}" | jq -r '.result') wei" fi