Skip to content

Commit b1a11a1

Browse files
vedhavyasvedhavyas
committed
shellcheck lint
1 parent f67eda2 commit b1a11a1

16 files changed

+106
-104
lines changed

‎build/scripts/deploy_oracle.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ set -e
44

55
# Allow passing parent directory as a parameter
66
PARENT_DIR=$1
7-
if [ -z ${PARENT_DIR} ];
7+
if [ -z "${PARENT_DIR}" ];
88
then
9-
PARENT_DIR=`pwd`
9+
PARENT_DIR=$(pwd)
1010
fi
1111

12-
if [ -z ${CENT_ETHEREUM_DAPP_CONTRACTS_DIR} ]; then
12+
if [ -z "${CENT_ETHEREUM_DAPP_CONTRACTS_DIR}" ]; then
1313
CENT_ETHEREUM_DAPP_CONTRACTS_DIR=${PARENT_DIR}/build
1414
fi
1515

@@ -39,11 +39,11 @@ if [[ -z "${NFT_UPDATE}" ]]; then
3939
fi
4040

4141
WARDS=[]
42-
REGISTRY=$(cat $PARENT_DIR/localAddresses | grep "genericNFT" | awk '{print $2}' | tr -d '\n')
43-
ORACLE=$(seth send --create out/NFTOracle.bin 'NFTOracle(address,address,bytes32,address[])' $NFT_UPDATE $REGISTRY $FINGERPRINT $WARDS)
42+
REGISTRY=$(< "$PARENT_DIR"/localAddresses grep "genericNFT" | awk '{print $2}' | tr -d '\n')
43+
ORACLE=$(seth send --create out/NFTOracle.bin 'NFTOracle(address,address,bytes32,address[])' "$NFT_UPDATE" "$REGISTRY" "$FINGERPRINT" "$WARDS")
4444

45-
seth send $ORACLE 'rely(address)' $OWNER
45+
seth send "$ORACLE" 'rely(address)' "$OWNER"
4646

47-
echo "oracle $ORACLE" >> $PARENT_DIR/localAddresses
47+
echo "oracle $ORACLE" >> "$PARENT_DIR"/localAddresses
4848

49-
cd $PARENT_DIR
49+
cd "$PARENT_DIR"

‎build/scripts/docker/entrypoint.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -x
44

55
CENT_MODE=${CENT_MODE:-run}
66

7-
ETHKEY=`cat /root/.centrifuge/secrets/eth.key`
8-
ETHPWD=`cat /root/.centrifuge/secrets/eth.pwd`
7+
ETHKEY=$(cat /root/.centrifuge/secrets/eth.key)
8+
ETHPWD=$(cat /root/.centrifuge/secrets/eth.pwd)
99

10-
CENT_ETHEREUM_ACCOUNTS_MAIN_KEY=$ETHKEY CENT_ETHEREUM_ACCOUNTS_MAIN_PASSWORD=$ETHPWD /root/centrifuge ${CENT_MODE} --config /root/.centrifuge/config/config.yaml $@
10+
CENT_ETHEREUM_ACCOUNTS_MAIN_KEY=$ETHKEY CENT_ETHEREUM_ACCOUNTS_MAIN_PASSWORD=$ETHPWD /root/centrifuge "${CENT_MODE}" --config /root/.centrifuge/config/config.yaml "$@"

‎build/scripts/docker/run.sh

+15-15
Original file line numberDiff line numberDiff line change
@@ -34,47 +34,47 @@ ADDITIONAL_CMD="${@:2}"
3434

3535
case "$mode" in
3636
init)
37-
mkdir -p ${ETH_DATADIR}/${NETWORK_ID}/files
38-
mkdir -p ${ETH_DATADIR}/${NETWORK_ID}/keystore
39-
mkdir -p ${ETH_DATADIR}/${NETWORK_ID}/.ethash
40-
if [ ! -f ${ETH_DATADIR}/${NETWORK_ID}/files/genesis.json ]; then
41-
cp $local_dir/../test-dependencies/test-ethereum/genesis.json ${ETH_DATADIR}/${NETWORK_ID}/files
37+
mkdir -p "${ETH_DATADIR}"/"${NETWORK_ID}"/files
38+
mkdir -p "${ETH_DATADIR}"/"${NETWORK_ID}"/keystore
39+
mkdir -p "${ETH_DATADIR}"/"${NETWORK_ID}"/.ethash
40+
if [ ! -f "${ETH_DATADIR}"/"${NETWORK_ID}"/files/genesis.json ]; then
41+
cp "$local_dir"/../test-dependencies/test-ethereum/genesis.json "${ETH_DATADIR}"/"${NETWORK_ID}"/files
4242
fi
4343

4444
INIT_ETH=true IDENTITY=$IDENTITY NETWORK_ID=$NETWORK_ID ETH_DATADIR=${ETH_DATADIR}/${NETWORK_ID} \
45-
docker-compose -f $local_dir/docker-compose-geth-init.yml up
45+
docker-compose -f "$local_dir"/docker-compose-geth-init.yml up
4646
;;
4747
local)
4848
IDENTITY=$IDENTITY NETWORK_ID=$NETWORK_ID ETH_DATADIR=${ETH_DATADIR}/${NETWORK_ID} GETH_LOCAL=true RPC_PORT=$RPC_PORT WS_PORT=$WS_PORT \
4949
BOOT_NODES=$BOOT_NODES \
50-
docker-compose -f $local_dir/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
50+
docker-compose -f "$local_dir"/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
5151
;;
5252
mine)
53-
cp $local_dir/../test-dependencies/test-ethereum/*.json ${ETH_DATADIR}/${NETWORK_ID}/keystore
53+
cp "$local_dir"/../test-dependencies/test-ethereum/*.json "${ETH_DATADIR}"/"${NETWORK_ID}"/keystore
5454

5555
IDENTITY=$IDENTITY NETWORK_ID=$NETWORK_ID ETH_DATADIR=${ETH_DATADIR}/${NETWORK_ID} RPC_PORT=$RPC_PORT API=$API \
5656
WS_PORT=$WS_PORT CENT_ETHEREUM_ACCOUNTS_MAIN_ADDRESS=$CENT_ETHEREUM_ACCOUNTS_MAIN_ADDRESS GETH_MINE=true \
57-
docker-compose -f $local_dir/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
57+
docker-compose -f "$local_dir"/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
5858
;;
5959
dev)
60-
mkdir -p ${ETH_DATADIR}/${NETWORK_ID}/keystore
61-
cp $local_dir/../test-dependencies/test-ethereum/*.json ${ETH_DATADIR}/${NETWORK_ID}/keystore
60+
mkdir -p "${ETH_DATADIR}"/"${NETWORK_ID}"/keystore
61+
cp "$local_dir"/../test-dependencies/test-ethereum/*.json "${ETH_DATADIR}"/"${NETWORK_ID}"/keystore
6262
IDENTITY=$IDENTITY NETWORK_ID=$NETWORK_ID ETH_DATADIR=${ETH_DATADIR}/${NETWORK_ID} RPC_PORT=$RPC_PORT API=$API \
6363
WS_PORT=$WS_PORT CENT_ETHEREUM_ACCOUNTS_MAIN_ADDRESS=$CENT_ETHEREUM_ACCOUNTS_MAIN_ADDRESS \
64-
TARGETGASLIMIT=$TARGETGASLIMIT docker-compose -f $local_dir/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
64+
TARGETGASLIMIT=$TARGETGASLIMIT docker-compose -f "$local_dir"/docker-compose-geth.yml up > /tmp/geth.log 2>&1 &
6565
;;
6666
centapi)
6767
CENT_MODE=$CENT_MODE ADDITIONAL_CMD=$ADDITIONAL_CMD API_DATADIR=$API_DATADIR API_CONFIGDIR=$API_CONFIGDIR \
6868
API_PORT=$API_PORT P2P_PORT=$P2P_PORT \
69-
docker-compose -f $local_dir/docker-compose-cent-api.yml up > /tmp/cent-api-${API_PORT}.log 2>&1 &
69+
docker-compose -f "$local_dir"/docker-compose-cent-api.yml up > /tmp/cent-api-"${API_PORT}".log 2>&1 &
7070
;;
7171
ccdev)
72-
docker-compose -f $local_dir/docker-compose-cc.yml up > /tmp/cc-0.log 2>&1 &
72+
docker-compose -f "$local_dir"/docker-compose-cc.yml up > /tmp/cc-0.log 2>&1 &
7373
;;
7474
bridge)
7575
BRIDGE_CONFIGDIR=$local_dir/../test-dependencies/bridge/config/
7676
BRIDGE_KEYSDIR=$local_dir/../test-dependencies/bridge/keys/
77-
BRIDGE_CONFIGDIR=$BRIDGE_CONFIGDIR BRIDGE_KEYSDIR=$BRIDGE_KEYSDIR docker-compose -f $local_dir/docker-compose-bridge.yml up > /tmp/bridge-0.log 2>&1 &
77+
BRIDGE_CONFIGDIR=$BRIDGE_CONFIGDIR BRIDGE_KEYSDIR=$BRIDGE_KEYSDIR docker-compose -f "$local_dir"/docker-compose-bridge.yml up > /tmp/bridge-0.log 2>&1 &
7878
;;
7979
*) usage
8080
esac

‎build/scripts/go-bindings-gen.sh

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33
set -x
44

5-
PARENT_DIR=`pwd`
5+
PARENT_DIR=$(pwd)
66
contracts=( "anchor.AnchorRegistry" "identity.Identity" "identity.IdentityRegistry" "identity.IdentityFactory" )
77

88
usage() {
@@ -46,42 +46,42 @@ BRANCH=${BRANCH:-master}
4646
if [ "X$CONTRACTS_REPO" != "X" ]
4747
then
4848
TEMP_DIR=${PARENT_DIR}/temp
49-
mkdir -p $TEMP_DIR
49+
mkdir -p "$TEMP_DIR"
5050

51-
git clone ${CONTRACTS_REPO} $TEMP_DIR
52-
cd $TEMP_DIR
51+
git clone "${CONTRACTS_REPO}" "$TEMP_DIR"
52+
cd "$TEMP_DIR"
5353
if [ "X$BRANCH" != "Xmaster" ]
5454
then
5555
git fetch
56-
git checkout -b $BRANCH origin/${BRANCH}
56+
git checkout -b "$BRANCH" origin/"${BRANCH}"
5757
fi
5858
git branch
59-
cd $PARENT_DIR
59+
cd "$PARENT_DIR"
6060
fi
6161

6262
CONTRACTS_REPO=${CONTRACTS_REPO:-${DEFAULT_REPO}}
6363

6464
echo "Building ABI Json files"
65-
rm -Rf $TEMP_DIR/build/contracts
66-
cd $TEMP_DIR
65+
rm -Rf "$TEMP_DIR"/build/contracts
66+
cd "$TEMP_DIR"
6767
npm install
6868
truffle compile
6969
mkdir -p abi
70-
cd $PARENT_DIR
70+
cd "$PARENT_DIR"
7171

7272
echo "Extracting ABI block into its own .abi file"
7373
for i in "${contracts[@]}"
7474
do
7575
echo "Building contracts for ${i}"
76-
package=`echo -n "${i}" | awk -F'.' '{print $1}'`
77-
contract=`echo -n "${i}" | awk -F'.' '{print $2}'`
78-
underscore=`echo "${contract}" | sed -e 's/\([A-Z]\)/_\1/g' | tr '[:upper:]' '[:lower:]'`
79-
mkdir -p ${TARGETDIR}/${package}
80-
cat $TEMP_DIR/build/contracts/${contract}.json | jq '.abi' > $TEMP_DIR/abi/${contract}.abi
81-
abigen --abi $TEMP_DIR/abi/${contract}.abi --pkg ${package} --type Ethereum${contract}Contract --out ${TARGETDIR}/${package}/ethereum${underscore}_contract.go
76+
package=$(echo -n "${i}" | awk -F'.' '{print $1}')
77+
contract=$(echo -n "${i}" | awk -F'.' '{print $2}')
78+
underscore=$(echo "${contract}" | sed -e 's/\([A-Z]\)/_\1/g' | tr '[:upper:]' '[:lower:]')
79+
mkdir -p "${TARGETDIR}"/"${package}"
80+
< "$TEMP_DIR"/build/contracts/"${contract}".json jq '.abi' > "$TEMP_DIR"/abi/"${contract}".abi
81+
abigen --abi "$TEMP_DIR"/abi/"${contract}".abi --pkg "${package}" --type Ethereum"${contract}"Contract --out "${TARGETDIR}"/"${package}"/ethereum"${underscore}"_contract.go
8282
done
8383

8484
if [ "${TEMP_DIR}" == "${PARENT_DIR}/temp" ]
8585
then
86-
rm -Rf $TEMP_DIR
86+
rm -Rf "$TEMP_DIR"
8787
fi

‎build/scripts/migrate.sh

+9-11
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ set -e
44

55
# Allow passing parent directory as a parameter
66
PARENT_DIR=$1
7-
if [ -z ${PARENT_DIR} ];
7+
if [ -z "${PARENT_DIR}" ];
88
then
9-
PARENT_DIR=`pwd`
9+
PARENT_DIR=$(pwd)
1010
echo "PARENT DIR ${PARENT_DIR}"
1111
fi
1212

1313
# Even if other `env_vars.sh` might hold this variable
1414
# Let's not count on it and be clear instead
15-
if [ -z ${CENT_ETHEREUM_CONTRACTS_DIR} ]; then
15+
if [ -z "${CENT_ETHEREUM_CONTRACTS_DIR}" ]; then
1616
CENT_ETHEREUM_CONTRACTS_DIR=${PARENT_DIR}/build/centrifuge-ethereum-contracts
1717
fi
1818

1919
# Assure that all the dependencies for the contracts are installed
20-
npm install --pwd ${CENT_ETHEREUM_CONTRACTS_DIR} --prefix=${CENT_ETHEREUM_CONTRACTS_DIR}
20+
npm install --pwd "${CENT_ETHEREUM_CONTRACTS_DIR}" --prefix="${CENT_ETHEREUM_CONTRACTS_DIR}"
2121

2222
# `truffle migrate` will fail if not executed in the sub-dir
23-
cd ${CENT_ETHEREUM_CONTRACTS_DIR}
23+
cd "${CENT_ETHEREUM_CONTRACTS_DIR}"
2424

2525
MIGRATE='false'
2626
# Clear up previous build if force build
@@ -29,30 +29,28 @@ if [[ "X${FORCE_MIGRATE}" == "Xtrue" ]]; then
2929
MIGRATE='true'
3030
fi
3131

32-
3332
LOCAL_ETH_CONTRACT_ADDRESSES="${CENT_ETHEREUM_CONTRACTS_DIR}/build/contracts/IdentityFactory.json"
34-
if [ ! -e $LOCAL_ETH_CONTRACT_ADDRESSES ]; then
33+
if [ ! -e "$LOCAL_ETH_CONTRACT_ADDRESSES" ]; then
3534
echo "$LOCAL_ETH_CONTRACT_ADDRESSES doesn't exist. Probably no migrations run yet. Forcing migrations."
3635
MIGRATE='true'
3736
fi
3837

3938
if [[ "X${MIGRATE}" == "Xtrue" ]]; then
4039
echo "Running the Solidity contracts migrations for local geth"
4140
sleep 30 # allow geth block gas limit to increase to more than 7000000
42-
${CENT_ETHEREUM_CONTRACTS_DIR}/scripts/migrate.sh localgeth
43-
if [ $? -ne 0 ]; then
41+
if ! "${CENT_ETHEREUM_CONTRACTS_DIR}"/scripts/migrate.sh localgeth; then
4442
exit 1
4543
fi
4644
fi
4745

48-
cd ${PARENT_DIR}
46+
cd "${PARENT_DIR}"
4947

5048
export FORCE_MIGRATE=$MIGRATE
5149

5250
# deploy bridge contracts
5351
./build/scripts/migrateBridgeContracts.sh
5452

55-
identityFactory=$(< $LOCAL_ETH_CONTRACT_ADDRESSES jq -r '.networks."1337".address')
53+
identityFactory=$(< "$LOCAL_ETH_CONTRACT_ADDRESSES" jq -r '.networks."1337".address')
5654
# deploy dapp smartcontracts
5755
IDENTITY_FACTORY=$identityFactory ./build/scripts/migrateDApp.sh
5856
# add bridge balance

‎build/scripts/migrateBridgeContracts.sh

+22-18
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,58 @@ set -e
44

55
# Allow passing parent directory as a parameter
66
PARENT_DIR=$1
7-
if [ -z ${PARENT_DIR} ];
7+
if [ -z "${PARENT_DIR}" ];
88
then
9-
PARENT_DIR=`pwd`
9+
PARENT_DIR=$(pwd)
1010
fi
1111

1212
MIGRATE='false'
1313

1414
# Clear up previous build if force build
15-
if [[ "X${FORCE_MIGRATE}" == "Xtrue" ]]; then
15+
if [[ "${FORCE_MIGRATE}" == "true" ]]; then
1616
MIGRATE='true'
1717
fi
1818

1919
BRIDGE_DEPLOYMENT_DIR=$PARENT_DIR/build/chainbridge-deploy/cb-sol-cli
2020

2121
BRIDGE_CONTRACTS_DIR=$BRIDGE_DEPLOYMENT_DIR/chainbridge-solidity
22-
if [ ! -e $BRIDGE_CONTRACTS_DIR/build/contracts/Bridge.json ]; then
22+
if [ ! -e "$BRIDGE_CONTRACTS_DIR"/build/contracts/Bridge.json ]; then
2323
echo "$BRIDGE_CONTRACTS_DIR doesn't exist. Probably no migrations run yet. Forcing migrations."
2424
MIGRATE='true'
2525
fi
2626

27-
if [[ "X${MIGRATE}" == "Xfalse" ]]; then
27+
if [[ "${MIGRATE}" == "false" ]]; then
2828
echo "not running Asset handler Migrations"
2929
exit 0
3030
fi
3131

3232
BRIDGE_DEPLOYMENT_DIR=$PARENT_DIR/build/chainbridge-deploy/cb-sol-cli
33-
cd $BRIDGE_DEPLOYMENT_DIR
33+
cd "$BRIDGE_DEPLOYMENT_DIR"
3434
make clean
3535
GIT_COMMIT=v1.0.0 make install
36-
cd $PARENT_DIR
36+
cd "$PARENT_DIR"
3737

38-
if [ -z ${CENT_ETHEREUM_DAPP_CONTRACTS_DIR} ]; then
38+
if [ -z "${CENT_ETHEREUM_DAPP_CONTRACTS_DIR}" ]; then
3939
CENT_ETHEREUM_DAPP_CONTRACTS_DIR=${PARENT_DIR}/build
4040
fi
4141

4242
source "${PARENT_DIR}/build/scripts/test-dependencies/test-ethereum/env_vars.sh"
4343

44-
cd $BRIDGE_DEPLOYMENT_DIR
45-
bridgeContracts=$(./index.js deploy --gasLimit 7500000 --all --relayerThreshold 1 --relayers $CENT_BRIDGE_RELAYER --privateKey $CENT_ETHEREUM_PRIVATE_KEY --url=$CENT_ETHEREUM_NODEURL)
44+
cd "$BRIDGE_DEPLOYMENT_DIR"
45+
bridgeContracts=$(./index.js deploy --gasLimit 7500000 --all --relayerThreshold 1 --relayers "$CENT_BRIDGE_RELAYER" --privateKey "$CENT_ETHEREUM_PRIVATE_KEY" --url="$CENT_ETHEREUM_NODEURL")
4646
bridgeAddr=$(echo -n "$bridgeContracts" | grep "Bridge:" | awk '{print $2}' | tr -d '\n')
4747
erc20Addr=$(echo -n "$bridgeContracts" | grep "Erc20 Handler:" | awk '{print $3}' | tr -d '\n')
4848
erc721Addr=$(echo -n "$bridgeContracts" | grep "Erc721 Handler:" | awk '{print $3}' | tr -d '\n')
4949
genericAddr=$(echo -n "$bridgeContracts" | grep "Generic Handler:" | awk '{print $3}' | tr -d '\n')
5050
echo "${bridgeContracts}"
51-
echo "bridgeAddr $bridgeAddr" > $PARENT_DIR/localAddresses
52-
echo "erc20Addr $erc20Addr" >> $PARENT_DIR/localAddresses
53-
echo "erc721Addr $erc721Addr" >> $PARENT_DIR/localAddresses
54-
echo "genericAddr $genericAddr" >> $PARENT_DIR/localAddresses
51+
rm -f "$PARENT_DIR"/localAddresses
52+
{
53+
echo "bridgeAddr $bridgeAddr"
54+
echo "erc20Addr $erc20Addr"
55+
echo "erc721Addr $erc721Addr"
56+
echo "genericAddr $genericAddr"
57+
} >> "$PARENT_DIR"/localAddresses
58+
5559

5660
# Deploying assetManager
5761
export ETH_RPC_ACCOUNTS=true
@@ -61,13 +65,13 @@ export ETH_RPC_URL=$CENT_ETHEREUM_NODEURL
6165
export ETH_PASSWORD="/dev/null"
6266
export ETH_FROM="0x89b0a86583c4444acfd71b463e0d3c55ae1412a5"
6367

64-
cd ${CENT_ETHEREUM_DAPP_CONTRACTS_DIR}/ethereum-bridge-contracts
68+
cd "${CENT_ETHEREUM_DAPP_CONTRACTS_DIR}"/ethereum-bridge-contracts
6569
dapp --use solc:0.5.15 update
6670
dapp --use solc:0.5.15 build --extract
6771

6872
assetManagerAddr=$(seth send --create out/BridgeAsset.bin 'BridgeAsset(uint8,address)' "10" "$genericAddr")
69-
echo "assetManager $assetManagerAddr" >> $PARENT_DIR/localAddresses
73+
echo "assetManager $assetManagerAddr" >> "$PARENT_DIR"/localAddresses
7074

71-
cb-sol-cli --gasLimit 7500000 --gasPrice 10000000000 --url $ETH_RPC_URL --privateKey $CENT_ETHEREUM_PRIVATE_KEY bridge register-generic-resource --bridge $bridgeAddr --handler $genericAddr --targetContract $assetManagerAddr --resourceId 0x0000000000000000000000000000000cb3858f3e48815bfd35c5347aa3b34c01 --deposit 0x00000000 --execute 0x654cf88c
75+
cb-sol-cli --gasLimit 7500000 --gasPrice 10000000000 --url "$ETH_RPC_URL" --privateKey "$CENT_ETHEREUM_PRIVATE_KEY" bridge register-generic-resource --bridge "$bridgeAddr" --handler "$genericAddr" --targetContract "$assetManagerAddr" --resourceId 0x0000000000000000000000000000000cb3858f3e48815bfd35c5347aa3b34c01 --deposit 0x00000000 --execute 0x654cf88c
7276

73-
cd $PARENT_DIR
77+
cd "$PARENT_DIR"

‎build/scripts/migrateDApp.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ set -e
44

55
# Allow passing parent directory as a parameter
66
PARENT_DIR=$1
7-
if [ -z ${PARENT_DIR} ];
7+
if [ -z "${PARENT_DIR}" ];
88
then
9-
PARENT_DIR=`pwd`
9+
PARENT_DIR=$(pwd)
1010
fi
1111

1212
MIGRATE='false'
1313

1414
# Clear up previous build if force build
15-
if [[ "X${FORCE_MIGRATE}" == "Xtrue" ]]; then
15+
if [[ "${FORCE_MIGRATE}" == "true" ]]; then
1616
MIGRATE='true'
1717
fi
1818

19-
if [ ! -e $PARENT_DIR/localAddresses ]; then
19+
if [ ! -e "$PARENT_DIR"/localAddresses ]; then
2020
echo "$PARENT_DIR/localAddresses doesn't exist. Probably no migrations run yet. Forcing migrations."
2121
MIGRATE='true'
2222
fi
2323

24-
if [[ "X${MIGRATE}" == "Xfalse" ]]; then
24+
if [[ "${MIGRATE}" == "false" ]]; then
2525
echo "not running Dapp Migrations"
2626
exit 0
2727
fi
2828

2929
source "${PARENT_DIR}/build/scripts/test-dependencies/test-ethereum/env_vars.sh"
3030

31-
if [ -z ${CENT_ETHEREUM_DAPP_CONTRACTS_DIR} ]; then
31+
if [ -z "${CENT_ETHEREUM_DAPP_CONTRACTS_DIR}" ]; then
3232
CENT_ETHEREUM_DAPP_CONTRACTS_DIR=${PARENT_DIR}/build
3333
fi
3434

@@ -42,21 +42,21 @@ export ETH_PASSWORD="/dev/null"
4242
export ETH_FROM="0x89b0a86583c4444acfd71b463e0d3c55ae1412a5"
4343

4444
# deploy NFT contract
45-
cd $NFT_DIR
45+
cd "$NFT_DIR"
4646
dapp --use solc:0.5.15 update
4747
dapp --use solc:0.5.15 build --extract
4848

4949
echo "Identity factory $IDENTITY_FACTORY"
50-
assetManagerAddr=$(cat $PARENT_DIR/localAddresses | grep "assetManager" | awk '{print $2}' | tr -d '\n')
50+
assetManagerAddr=$(< "$PARENT_DIR"/localAddresses grep "assetManager" | awk '{print $2}' | tr -d '\n')
5151
nftAddr=$(seth send --create out/AssetNFT.bin 'AssetNFT(address, address)' "$assetManagerAddr" "$IDENTITY_FACTORY")
52-
echo "genericNFT $nftAddr" >> $PARENT_DIR/localAddresses
52+
echo "genericNFT $nftAddr" >> "$PARENT_DIR"/localAddresses
5353

54-
genericAddr=$(cat $PARENT_DIR/localAddresses | grep "genericAddr" | awk '{print $2}' | tr -d '\n')
55-
bridgeAddr=$(cat $PARENT_DIR/localAddresses | grep "bridgeAddr" | awk '{print $2}' | tr -d '\n')
56-
erc721Addr=$(cat $PARENT_DIR/localAddresses | grep "erc721Addr" | awk '{print $2}' | tr -d '\n')
57-
erc20Addr=$(cat $PARENT_DIR/localAddresses | grep "erc20Addr" | awk '{print $2}' | tr -d '\n')
54+
genericAddr=$(< "$PARENT_DIR"/localAddresses grep "genericAddr" | awk '{print $2}' | tr -d '\n')
55+
bridgeAddr=$(< "$PARENT_DIR"/localAddresses grep "bridgeAddr" | awk '{print $2}' | tr -d '\n')
56+
erc721Addr=$(< "$PARENT_DIR"/localAddresses grep "erc721Addr" | awk '{print $2}' | tr -d '\n')
57+
erc20Addr=$(< "$PARENT_DIR"/localAddresses grep "erc20Addr" | awk '{print $2}' | tr -d '\n')
5858
echo "creating bridge config with bridge addresses $bridgeAddr $erc721Addr $erc20Addr $genericAddr"
5959
bridge_dir="$PARENT_DIR"/build/scripts/test-dependencies/bridge
6060
"$bridge_dir"/create_config.sh "$bridge_dir"/config "$bridgeAddr" "$erc721Addr" "$erc20Addr" "$genericAddr"
6161

62-
cd $PARENT_DIR
62+
cd "$PARENT_DIR"

0 commit comments

Comments
 (0)