All exported address are checksum + fix some auth-checker checks + fi…

…x deploying migration contract

bin/auth-checker

@@ -34,7 +34,7 @@ checkRely() {
     CHECK=$(seth call "${!1}" 'wards(address)' "${!2}")
 
     printf "RELY: %s -> %s -> %s -> " "${1}" "${2}" "${3}"
-    if [[ "${!3}" == "$CHECK" ]]; then
+    if [[ $(toLower "${!3}") == $(toLower "${CHECK}") ]]; then
         ok
     else
         notok
@@ -43,10 +43,10 @@ checkRely() {
 
 checkAuthority() {
     local CHECK
-    CHECK=$(seth call "${!1}" 'authority()(address)')
+    CHECK=0x$(seth call "${!1}" 'authority()(address)')
 
     printf "AUTH: %s -> %s -> " "${1}" "${2}"
-    if [[ "${!2}" == "0x${CHECK}" ]]; then
+    if [[ $(toLower "${!2}") == $(toLower "${CHECK}") ]]; then
         ok
     else
         notok
@@ -55,10 +55,10 @@ checkAuthority() {
 
 checkOwner() {
     local CHECK
-    CHECK=$(seth call "${!1}" 'owner()(address)')
+    CHECK=0x$(seth call "${!1}" 'owner()(address)')
 
     printf "OWN: %s -> %s -> " "${1}" "${2}"
-    if [[ "${!2}" == "0x${CHECK}" ]]; then
+    if [[ $(toLower "${!2}") == $(toLower "${CHECK}") ]]; then
         ok
     else
         notok
@@ -67,10 +67,10 @@ checkOwner() {
 
 checkRoot() {
     local CHECK
-    CHECK=$(seth call "${!1}" 'root()(address)')
+    CHECK=0x$(seth call "${!1}" 'root()(address)')
 
     printf "OWN: %s -> %s -> " "${1}" "${2}"
-    if [[ "${!2}" == "0x${CHECK}" ]]; then
+    if [[ $(toLower "${!2}") == $(toLower "${CHECK}") ]]; then
         ok
     else
         notok
@@ -103,6 +103,8 @@ checkWhitelist() {
     fi
 }
 
+tokens=$(jq -r ".tokens | keys_unsorted[]" "$CONFIG_FILE")
+
 # vat
 checkRely "MCD_VAT" "MCD_DEPLOY" "NOT_AUTHED"
 checkRely "MCD_VAT" "MCD_CAT" "AUTHED"
@@ -111,7 +113,6 @@ checkRely "MCD_VAT" "MCD_POT" "AUTHED"
 checkRely "MCD_VAT" "MCD_SPOT" "AUTHED"
 checkRely "MCD_VAT" "MCD_END" "AUTHED"
 checkRely "MCD_VAT" "MCD_PAUSE_PROXY" "AUTHED"
-tokens=$(jq -r ".tokens | keys_unsorted[]" "$CONFIG_FILE")
 for token in $tokens; do
     ilks=$(jq -r ".tokens.${token}.ilks | keys_unsorted[]" "$CONFIG_FILE")
     for ilk in $ilks; do

bin/dss-deploy

@@ -55,7 +55,7 @@ fi
 
 "$LIBEXEC_DIR"/base-deploy |& tee "$OUT_DIR/dss-$1.log"
 
-NETWORK=$(echo "$1" | tr '[:lower:]' '[:upper:]')
+NETWORK=$(toUpper "$1")
 if [[ -f "$CASE" ]]; then
     log "${NETWORK} DEPLOYMENT + ${CASE_NAME} COMPLETED SUCCESSFULLY"
 else

lib/common.sh

@@ -131,6 +131,14 @@ log() {
     echo ""
 }
 
+toUpper() {
+    echo "$1" | tr '[:lower:]' '[:upper:]'
+}
+
+toLower() {
+    echo "$1" | tr '[:upper:]' '[:lower:]'
+}
+
 # Start verbose output
 # set -x
 

libexec/base-deploy

@@ -155,8 +155,9 @@ GET_CDPS=$(dappCreate dss-proxy-actions GetCdps)
 log "GET_CDPS=$GET_CDPS"
 
 SAI_TUB=$(jq -r ".migration.tub | values" "$CONFIG_FILE")
-ethAdapterAddr="$(jq -r ".migration.ethAdapterVarName | values" "$CONFIG_FILE")"
+ethAdapterAddr="$(eval echo "\$$(jq -r ".migration.ethAdapterVarName | values" "$CONFIG_FILE")")"
 if [[ -n "$SAI_TUB" && -n "$ethAdapterAddr" ]]; then
+    SAI_TUB=$(seth --to-checksum-address "$SAI_TUB")
     SAI="0x$(seth call "$SAI_TUB" 'sai()(address)')"
     export SAI
     PIP_SAI=$(dappCreate osm DSValue)
@@ -248,31 +249,31 @@ fi
 
 for token in $tokens; do
     ILKS_VARS+=",
-    \"${token}\": \"$(eval echo "\$${token}")\""
+    \"${token}\": \"$(seth --to-checksum-address "$(eval echo "\$${token}")")\""
     if [[ "$(eval echo "\$VAL_${token}")" != "" ]]; then
     ILKS_VARS+=",
-    \"VAL_${token}\": \"$(eval echo "\$VAL_${token}")\""
+    \"VAL_${token}\": \"$(seth --to-checksum-address "$(eval echo "\$VAL_${token}")")\""
     fi
     ILKS_VARS+=",
-    \"PIP_${token}\": \"$(eval echo "\$PIP_${token}")\""
+    \"PIP_${token}\": \"$(seth --to-checksum-address "$(eval echo "\$PIP_${token}")")\""
     ilks=$(jq -r ".tokens.${token}.ilks | keys_unsorted[]" "$CONFIG_FILE")
     for ilk in $ilks; do
     ILKS_VARS+=",
     \"MCD_JOIN_${token}_${ilk}\": \"$(eval echo "\$MCD_JOIN_${token}_${ilk}")\""
     ILKS_VARS+=",
-    \"MCD_FLIP_${token}_${ilk}\": \"$(eval echo "\$MCD_FLIP_${token}_${ilk}")\""
+    \"MCD_FLIP_${token}_${ilk}\": \"$(seth --to-checksum-address "$(eval echo "\$MCD_FLIP_${token}_${ilk}")")\""
     done
 done
 
 if [[ -n "$MIGRATION" ]]; then
     ILKS_VARS+=",
-    \"SAI\": \"$SAI\""
+    \"SAI\": \"$(seth --to-checksum-address "$SAI")\""
     ILKS_VARS+=",
     \"PIP_SAI\": \"$PIP_SAI\""
     ILKS_VARS+=",
     \"MCD_JOIN_SAI\": \"$MCD_JOIN_SAI\""
     ILKS_VARS+=",
-    \"MCD_FLIP_SAI\": \"$MCD_FLIP_SAI\""
+    \"MCD_FLIP_SAI\": \"$(seth --to-checksum-address "$MCD_FLIP_SAI")\""
 
     MIGRATION_VARS=",
     \"SAI_TUB\": \"$SAI_TUB\""
@@ -298,36 +299,36 @@ fi
 # Generate addresses.json file
 cat > "$OUT_DIR"/addresses.json <<EOF
 {
-    "DEPLOYER": "$ETH_FROM",
+    "DEPLOYER": "$(seth --to-checksum-address "$ETH_FROM")",
     "MULTICALL": "$MULTICALL",
-    "FAUCET": "$FAUCET",
+    "FAUCET": "$(seth --to-checksum-address "$FAUCET")",
     "MCD_DEPLOY": "$MCD_DEPLOY",
-    "MCD_GOV": "$MCD_GOV"$GOV_GUARD_VAR$MCD_IOU_VAR,
-    "MCD_ADM": "$MCD_ADM"$VOTE_PROXY_FACTORY_VAR,
-    "MCD_VAT": "$MCD_VAT",
-    "MCD_JUG": "$MCD_JUG",
-    "MCD_CAT": "$MCD_CAT",
-    "MCD_VOW": "$MCD_VOW",
-    "MCD_JOIN_DAI": "$MCD_JOIN_DAI",
-    "MCD_FLAP": "$MCD_FLAP",
-    "MCD_FLOP": "$MCD_FLOP",
-    "MCD_PAUSE": "$MCD_PAUSE",
-    "MCD_PAUSE_PROXY": "$MCD_PAUSE_PROXY",
+    "MCD_GOV": "$(seth --to-checksum-address "$MCD_GOV")"$GOV_GUARD_VAR$MCD_IOU_VAR,
+    "MCD_ADM": "$(seth --to-checksum-address "$MCD_ADM")"$VOTE_PROXY_FACTORY_VAR,
+    "MCD_VAT": "$(seth --to-checksum-address "$MCD_VAT")",
+    "MCD_JUG": "$(seth --to-checksum-address "$MCD_JUG")",
+    "MCD_CAT": "$(seth --to-checksum-address "$MCD_CAT")",
+    "MCD_VOW": "$(seth --to-checksum-address "$MCD_VOW")",
+    "MCD_JOIN_DAI": "$(seth --to-checksum-address "$MCD_JOIN_DAI")",
+    "MCD_FLAP": "$(seth --to-checksum-address "$MCD_FLAP")",
+    "MCD_FLOP": "$(seth --to-checksum-address "$MCD_FLOP")",
+    "MCD_PAUSE": "$(seth --to-checksum-address "$MCD_PAUSE")",
+    "MCD_PAUSE_PROXY": "$(seth --to-checksum-address "$MCD_PAUSE_PROXY")",
     "MCD_GOV_ACTIONS": "$MCD_GOV_ACTIONS",
-    "MCD_DAI": "$MCD_DAI",
-    "MCD_SPOT": "$MCD_SPOT",
-    "MCD_POT": "$MCD_POT",
-    "MCD_END": "$MCD_END",
-    "MCD_ESM": "$MCD_ESM",
+    "MCD_DAI": "$(seth --to-checksum-address "$MCD_DAI")",
+    "MCD_SPOT": "$(seth --to-checksum-address "$MCD_SPOT")",
+    "MCD_POT": "$(seth --to-checksum-address "$MCD_POT")",
+    "MCD_END": "$(seth --to-checksum-address "$MCD_END")",
+    "MCD_ESM": "$(seth --to-checksum-address "$MCD_ESM")",
     "PROXY_ACTIONS": "$PROXY_ACTIONS",
     "PROXY_ACTIONS_END": "$PROXY_ACTIONS_END",
     "PROXY_ACTIONS_DSR": "$PROXY_ACTIONS_DSR",
     "CDP_MANAGER": "$CDP_MANAGER",
     "GET_CDPS": "$GET_CDPS",
-    "PROXY_FACTORY": "$PROXY_FACTORY",
-    "PROXY_REGISTRY": "$PROXY_REGISTRY"$ILKS_VARS,
+    "PROXY_FACTORY": "$(seth --to-checksum-address "$PROXY_FACTORY")",
+    "PROXY_REGISTRY": "$(seth --to-checksum-address "$PROXY_REGISTRY")"$ILKS_VARS,
     "PROXY_PAUSE_ACTIONS": "$PROXY_PAUSE_ACTIONS",
-    "PROXY_DEPLOYER": "$PROXY_DEPLOYER"$MIGRATION_VARS
+    "PROXY_DEPLOYER": "$(seth --to-checksum-address "$PROXY_DEPLOYER")"$MIGRATION_VARS
 }
 EOF
 

libexec/setters/set-beg

@@ -10,13 +10,13 @@ loadAddresses
 
 { test "$1" != "flap" && test "$1" != "flop"; } && exit 1
 
-log "SET $(echo "$1" | tr '[:lower:]' '[:upper:]') BEG:"
+log "SET $(toUpper "$1") BEG:"
 
 # Set beg
 beg=$(jq -r ".$1_beg | values" "$CONFIG_FILE")
 if [[ "$beg" != "" ]]; then
     beg=$(echo "($beg+100)"*10^16 | bc -l)
     beg=$(seth --to-uint256 "${beg%.*}")
-    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(echo "$1" | tr '[:lower:]' '[:upper:]')")" "$(seth --to-bytes32 "$(seth --from-ascii "beg")")" "$beg")"
+    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(toUpper "$1")")" "$(seth --to-bytes32 "$(seth --from-ascii "beg")")" "$beg")"
     sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
 fi

libexec/setters/set-tau

@@ -10,11 +10,11 @@ loadAddresses
 
 { test "$1" != "flap" && test "$1" != "flop"; } && exit 1
 
-log "SET $(echo "$1" | tr '[:lower:]' '[:upper:]') TAU:"
+log "SET $(toUpper "$1") TAU:"
 
 # Set tau
 tau=$(jq -r ".$1_tau | values" "$CONFIG_FILE")
 if [[ "$tau" != "" ]]; then
-    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(echo "$1" | tr '[:lower:]' '[:upper:]')")" "$(seth --to-bytes32 "$(seth --from-ascii "tau")")" "$tau")"
+    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(toUpper "$1")")" "$(seth --to-bytes32 "$(seth --from-ascii "tau")")" "$tau")"
     sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
 fi

libexec/setters/set-ttl

@@ -10,11 +10,11 @@ loadAddresses
 
 { test "$1" != "flap" && test "$1" != "flop"; } && exit 1
 
-log "SET $(echo "$1" | tr '[:lower:]' '[:upper:]') TTL:"
+log "SET $(toUpper "$1") TTL:"
 
 # Set ttl
 ttl=$(jq -r ".$1_ttl | values" "$CONFIG_FILE")
 if [[ "$ttl" != "" ]]; then
-    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(echo "$1" | tr '[:lower:]' '[:upper:]')")" "$(seth --to-bytes32 "$(seth --from-ascii "ttl")")" "$ttl")"
+    calldata="$(seth calldata 'file(address,address,address,bytes32,uint256)' "$MCD_PAUSE" "$MCD_GOV_ACTIONS" "$(eval echo "\$MCD_$(toUpper "$1")")" "$(seth --to-bytes32 "$(seth --from-ascii "ttl")")" "$ttl")"
     sethSend "$PROXY_DEPLOYER" 'execute(address,bytes memory)' "$PROXY_PAUSE_ACTIONS" "$calldata"
 fi