Fix displaying ETH balance in wrap and unwrap commands + lint fixes

makerdao · Oct 31, 2019 · c1cbb2e · c1cbb2e
1 parent 7877c21
commit c1cbb2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/libexec/mcd/mcd---to-wad b/libexec/mcd/mcd---to-wad
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # hex to decimal wad
 set -e
-seth --to-fix 18 $(mcd --to-dec $1)
+seth --to-fix 18 "$(mcd --to-dec "$1")"
diff --git a/libexec/mcd/mcd-unwrap b/libexec/mcd/mcd-unwrap
@@ -2,15 +2,15 @@
 ### mcd-unwrap -- Unwrap WETH to ETH
 ### Usage: mcd unwrap <amount>
 set -e
-mcd --require-from $0
+mcd --require-from "$0"
 [ -n "$1" ] || mcd --fail "mcd-wrap: Please specify an amount to wrap"
-seth send ${ETH?} 'withdraw(uint)' $(seth --to-word $(seth --to-wei "$1 eth"))
+seth send "${ETH?}" 'withdraw(uint)' "$(seth --to-word "$(seth --to-wei "$1 eth")")"
 
 [[ $SETH_ASYNC == yes ]] && exit 1
 
 sig="balanceOf(address)(uint)"
-weth=$(mcd --to-wad $(seth call ${ETH?} "$sig" "$ETH_FROM"))
-eth=$(mcd --to-wad $(seth balance $ETH_FROM))
+weth=$(mcd --to-wad "$(seth call "${ETH?}" "$sig" "$ETH_FROM")")
+eth=$(seth --to-fix 18 "$(seth balance "$ETH_FROM")")
 
 echo "eth  $eth"
 echo "weth $weth"
diff --git a/libexec/mcd/mcd-wrap b/libexec/mcd/mcd-wrap
@@ -2,15 +2,15 @@
 ### mcd-wrap -- Wrap ETH to WETH
 ### Usage: mcd wrap <amount>
 set -e
-mcd --require-from $0
+mcd --require-from "$0"
 [ -n "$1" ] || mcd --fail "mcd-wrap: Please specify an amount to wrap"
-seth send ${ETH?} --value $(seth --to-wei "$1 eth")
+seth send "${ETH?}" --value "$(seth --to-wei "$1 eth")"
 
 [[ $SETH_ASYNC == yes ]] && exit 1
 
 sig="balanceOf(address)(uint)"
-weth=$(mcd --to-wad $(seth call ${ETH?} "$sig" "$ETH_FROM"))
-eth=$(mcd --to-wad $(seth balance $ETH_FROM))
+weth=$(mcd --to-wad "$(seth call "${ETH?}" "$sig" "$ETH_FROM")")
+eth=$(seth --to-fix 18 "$(seth balance "$ETH_FROM")")
 
 echo "eth  $eth"
 echo "weth $weth"