diff --git a/install-tbtc-dapp.sh b/install-tbtc-dapp.sh index 91f764f..d06e9bb 100755 --- a/install-tbtc-dapp.sh +++ b/install-tbtc-dapp.sh @@ -11,18 +11,10 @@ WORKDIR=$PWD printf "${LOG_START}Starting tBTC dApp deployment...${LOG_END}" -printf "${LOG_START}Preparing keep-ecdsa artifacts...${LOG_END}" - -cd $WORKDIR/keep-ecdsa - -cd solidity -ln -sf build/contracts artifacts - printf "${LOG_START}Preparing tbtc artifacts...${LOG_END}" -cd $WORKDIR/tbtc +cd "$WORKDIR/tbtc/solidity" -cd solidity ln -sf build/contracts artifacts printf "${LOG_START}Updating tbtc.js configuration...${LOG_END}" diff --git a/install-tbtc.sh b/install-tbtc.sh index 884025d..47f2035 100755 --- a/install-tbtc.sh +++ b/install-tbtc.sh @@ -20,11 +20,11 @@ done printf "${LOG_START}Starting tBTC deployment...${LOG_END}" +printf "${LOG_START}Using $BTC_NETWORK Bitcoin network${LOG_END}" + cd "$WORKDIR/relay-genesis" npm install -printf "${LOG_START}Using $BTC_NETWORK Bitcoin network${LOG_END}" - if [ "$BTC_NETWORK" == "testnet" ]; then # Deploy TestnetRelay instead of the defaull MockRelay. printf "${LOG_START}Updating testnet relay configuration...${LOG_END}" @@ -39,6 +39,20 @@ if [ "$BTC_NETWORK" == "testnet" ]; then jq '.init.bitcoinTest |= fromjson' relay-config.json > relay-config.json.tmp && mv relay-config.json.tmp relay-config.json fi +printf "${LOG_START}Preparing keep-ecdsa artifacts...${LOG_END}" + +cd "$WORKDIR/keep-ecdsa/solidity" + +ln -sf build/contracts artifacts + +printf "${LOG_START}Updating tBTC configuration...${LOG_END}" + +cd "$WORKDIR/tbtc/solidity" + +KEEP_ECDSA_DIR="$WORKDIR/keep-ecdsa/solidity" jq '.dependencies."@keep-network/keep-ecdsa" = env.KEEP_ECDSA_DIR' package.json > package.json.tmp && mv package.json.tmp package.json + +printf "${LOG_START}Running install script...${LOG_END}" + cd "$WORKDIR/tbtc" # Run tBTC install script. Answer with ENTER on emerging prompt.