#303 Upgrade Cosmos-SDK to v0.47.8

- Setup Validator node with latest binary

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>
Signed-off-by: Abdulbois <abdulbois123@gmail.com>

Author: Abdulbois

integration_tests/upgrade/01-test-upgrade-initialize-0.12.sh

@@ -26,6 +26,7 @@ $DCLD_BIN config broadcast-mode block
 
 container="validator-demo"
 add_validator_node() {
+  # FIXME: as it's called before upgrade, mainnet stable version of dcld needs to be used (not the latest master)
   random_string account
   address=""
   LOCALNET_DIR=".localnet"
@@ -41,9 +42,15 @@ add_validator_node() {
   passphrase="test1234"
   docker_network="distributed-compliance-ledger_localnet"
 
+  docker build -f Dockerfile-build -t dcld-build .
+  docker container create --name dcld-build-inst dcld-build
+  docker cp dcld-build-inst:/go/bin/dcld ./
+  docker rm dcld-build-inst
+
   docker run -d --name $container --ip $ip -p "$node_p2p_port-$node_client_port:26656-26657" --network $docker_network -i dcledger
 
-  docker cp $DCLD_BIN "$container":"$DCL_USER_HOME"/dcld
+  docker cp ./dcld "$container":"$DCL_USER_HOME"/
+  rm -f ./dcld
 
   test_divider
 
@@ -52,8 +59,7 @@ add_validator_node() {
     ./dcld config chain-id dclchain &&
     ./dcld config output json &&
     ./dcld config node $node0conn &&
-    ./dcld config keyring-backend test &&
-    ./dcld config broadcast-mode block"
+    ./dcld config keyring-backend test"
 
   test_divider
 
@@ -72,13 +78,15 @@ add_validator_node() {
 
   address="$(docker exec $container /bin/sh -c "echo $passphrase | ./dcld keys show $account -a")"
   pubkey="$(docker exec $container /bin/sh -c "echo $passphrase | ./dcld keys show $account -p")"
-  alice_address="$($DCLD_BIN keys show alice -a)"
-  bob_address="$($DCLD_BIN keys show bob -a)"
-  jack_address="$($DCLD_BIN keys show jack -a)"
+  alice_address="$(dcld keys show alice -a)"
+  bob_address="$(dcld keys show bob -a)"
+  jack_address="$(dcld keys show jack -a)"
   echo "Create account for $account and Assign NodeAdmin role"
-  echo $passphrase | $DCLD_BIN tx auth propose-add-account --address="$address" --pubkey="$pubkey" --roles="NodeAdmin" --from jack --yes
-  echo $passphrase | $DCLD_BIN tx auth approve-add-account --address="$address" --from alice --yes
-  echo $passphrase | $DCLD_BIN tx auth approve-add-account --address="$address" --from bob --yes
+  echo $passphrase | dcld tx auth propose-add-account --address="$address" --pubkey="$pubkey" --roles="NodeAdmin" --from jack --yes
+  result=$(echo $passphrase | $DCLD_BIN tx auth approve-add-account --address="$address" --from alice --yes)
+  result=$(get_txn_result "$result")
+  result=$(echo $passphrase | $DCLD_BIN tx auth approve-add-account --address="$address" --from bob --yes)
+  result=$(get_txn_result "$result")
 
   test_divider
   vaddress=$(docker exec $container ./dcld tendermint show-address)
@@ -98,6 +106,7 @@ add_validator_node() {
       set -eu; echo test1234 | $DCLD_BIN tx validator add-node --pubkey='$vpubkey' --moniker="$node_name" --from="$account" --yes
 EOF
   result="$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator add-node --pubkey='$vpubkey' --moniker="$node_name" --from="$account" --yes")"
+  result=$(get_txn_result "$result")
   check_response "$result" "\"code\": 0"
   echo "$result"
 
@@ -113,7 +122,7 @@ EOF
   docker exec -d $container cosmovisor start
   sleep 10
 
-  result=$($DCLD_BIN query validator node --address "$address")
+  result=$(dcld query validator node --address "$address")
   validator_address=$(echo "$result" | jq -r '.owner')
   echo "$result"
 }

integration_tests/upgrade/03-test-upgrade-1.2-to-1.4.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -euo pipefail
+#set -euo pipefail
 source integration_tests/cli/common.sh
 
 # Upgrade constants
@@ -26,11 +26,11 @@ binary_version_new="v1.4.0-dev3"
 wget -O dcld_old "https://github.com/zigbee-alliance/distributed-compliance-ledger/releases/download/$binary_version_old/dcld"
 chmod ugo+x dcld_old
 
-wget -O dcld "https://github.com/zigbee-alliance/distributed-compliance-ledger/releases/download/$binary_version_new/dcld"
-chmod ugo+x dcld
+wget -O dcld_new "https://github.com/zigbee-alliance/distributed-compliance-ledger/releases/download/$binary_version_new/dcld"
+chmod ugo+x dcld_new
 
 DCLD_BIN_OLD="./dcld_old"
-DCLD_BIN_NEW="./dcld"
+DCLD_BIN_NEW="./dcld_new"
 $DCLD_BIN_NEW config broadcast-mode sync
 ########################################################################################