#303 Upgrade Cosmos-SDK to v0.47.3

- Add extra line into shell tests to get `txn` status

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

Author: Abdulbois

genlocalnetconfig.sh

@@ -215,6 +215,7 @@ if [[ -n "$DCL_LIGHT_CLIENT_PROXY" ]]; then
     init_light_client_proxy lightclient0
 fi
 
+chmod 777 -R $DCL_DIR
 #if [ -n "$MAINNET_STABLE_VERSION" ]; then
 #    rm dcld
 #fi

integration_tests/cli/auth-demo-hex.sh

@@ -44,6 +44,7 @@ pid=2577
 
 echo "Jack proposes account for $user"
 result=$(echo $passphrase | dcld tx auth propose-add-account --info="Jack is proposing this account" --address="$user_address" --pubkey="$user_pubkey" --roles="Vendor" --vid="$vid_in_hex_format" --from jack --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 0"
 
 test_divider
@@ -77,6 +78,7 @@ test_divider
 productName="Device #1"
 echo "$user adds Model with VID: $vid_in_hex_format PID: $pid"
 result=$(echo "test1234" | dcld tx model add-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --productName="$productName" --productLabel="Device Description"   --commissioningCustomFlow=0 --deviceTypeID=12 --partNumber=12 --from=$user_address --yes)
+result=$(get_txn_result "$result")
 check_response_and_report "$result" "\"code\": 0"
 
 test_divider
@@ -85,12 +87,14 @@ vid_plus_one_in_hex_format=0xA14
 vidPlusOne=$((vid_in_hex_format+1))
 echo "$user adds Model with a VID: $vid_plus_one_in_hex_format PID: $pid_in_hex_format, This fails with Permission denied as the VID is not associated with this vendor account."
 result=$(echo "test1234" | dcld tx model add-model --vid=$vid_plus_one_in_hex_format --pid=$pid_in_hex_format --productName="$productName" --productLabel="Device Description"   --commissioningCustomFlow=0 --deviceTypeID=12 --partNumber=12 --from=$user_address --yes 2>&1) || true
+result=$(get_txn_result "$result")
 check_response_and_report "$result" "transaction should be signed by a vendor account containing the vendorID $vidPlusOne"
 
 test_divider
 
 echo "$user updates Model with VID: $vid_in_hex_format PID: $pid_in_hex_format"
 result=$(echo "test1234" | dcld tx model update-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --productName="$productName" --productLabel="Device Description" --partNumber=12 --from=$user_address --yes)
+result=$(get_txn_result "$result")
 check_response_and_report "$result" "\"code\": 0"
 
 test_divider

integration_tests/cli/auth-demo.sh

@@ -122,11 +122,13 @@ create_new_account(){
 
   echo "Jack proposes account for \"$name\" with roles: \"$roles\""
   result=$(echo $passphrase | dcld tx auth propose-add-account --address="$address" --pubkey="$pubkey" --roles=$roles --from jack --yes)
+  result=$(get_txn_result "$result")
   check_response "$result" "\"code\": 0"
   echo "$result"
 
   echo "Alice approves account for \"$name\" with roles: \"$roles\""
   result=$(echo $passphrase | dcld tx auth approve-add-account --address="$address" --from alice --yes)
+  result=$(get_txn_result "$result")
   check_response "$result" "\"code\": 0"
   echo "$result"
 }
@@ -149,6 +151,7 @@ create_new_vendor_account(){
     echo "Jack proposes account for \"$_name\" with Vendor role"
     _result=$(echo $passphrase | dcld tx auth propose-add-account --address="$_address" --pubkey="$_pubkey" --roles=Vendor --vid=$_vid --from jack --yes)
   fi
+  _result=$(get_txn_result "$_result")
   check_response "$_result" "\"code\": 0"
 
 }
@@ -160,8 +163,10 @@ create_model_and_version() {
   local _softwareVersionString="$4"
   local _user_address="$5"
   result=$(echo "$passphrase" | dcld tx model add-model --vid=$_vid --pid=$_pid --deviceTypeID=1 --productName=TestProduct --productLabel=TestingProductLabel --partNumber=1 --commissioningCustomFlow=0 --from=$_user_address --yes)
+  result=$(get_txn_result "$result")
   check_response "$result" "\"code\": 0"
   result=$(echo "$passphrase" | dcld tx model add-model-version --cdVersionNumber=1 --maxApplicableSoftwareVersion=10 --minApplicableSoftwareVersion=1 --vid=$_vid --pid=$_pid --softwareVersion=$_softwareVersion --softwareVersionString=$_softwareVersionString --from=$_user_address --yes)
+  result=$(get_txn_result "$result")
   check_response "$result" "\"code\": 0"
 }
 
@@ -238,3 +243,22 @@ execute_with_retry() {
 
   echo "$_result"
 }
+
+
+get_txn_result() {
+  local _broadcast_result=${1}
+  local _txHash=$(echo "$_broadcast_result" | jq -r '.txhash')
+  local _command="dcld query tx $_txHash"
+  local _result=$($_command 2>&1)
+
+  for i in {1..10}; do
+    if [[ "$(_check_response "$_result" "not found" "raw")" == true ]]; then
+      sleep 2
+      _result=$($_command 2>&1)
+    else
+      break  
+    fi
+  done
+
+  echo "$_result"
+}

integration_tests/cli/common.sh

@@ -48,13 +48,15 @@ cd_certificate_id="some ID"
 
 echo "Add Model with VID: $vid_in_hex_format PID: $pid_in_hex_format"
 result=$(echo "$passphrase" | dcld tx model add-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --deviceTypeID=1 --productName=TestProduct --productLabel=TestingProductLabel --partNumber=1 --commissioningCustomFlow=0  --from $vendor_account --yes)
+result=$(get_txn_result "$result")
 echo $result
 check_response "$result" "\"code\": 0"
 
 test_divider
 
 echo "Certify unknown Model Version with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} with zigbee certification"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --from $zb_account --yes)
+result=$(get_txn_result "$result")
 echo "$result"
 check_response "$result" "\"code\": 517"
 check_response "$result" "No model version"
@@ -63,6 +65,7 @@ test_divider
 
 echo "Add Model Version with VID: $vid_in_hex_format PID: $pid_in_hex_format SV: $sv SoftwareVersionString:$svs"
 result=$(echo '$passphrase' | dcld tx model add-model-version --cdVersionNumber=1 --maxApplicableSoftwareVersion=10 --minApplicableSoftwareVersion=1 --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --from=$vendor_account --yes)
+result=$(get_txn_result "$result")
 echo $result
 check_response "$result" "\"code\": 0"
 
@@ -116,13 +119,15 @@ test_divider
 invalid_svs=$RANDOM
 echo "Certify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} with zigbee certification and invalid SoftwareVersionString: $invalid_svs"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$invalid_svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --from $zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 306"
 # check_response "$result" "failed to execute message; message index: 0: Model with vid=$vid, pid=$pid, softwareVersion=$sv present on the ledger does not have matching softwareVersionString=$invalid_svs: model version does not match"
 
 test_divider
 
 echo "Certify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} with zigbee certification"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 echo "$result"
 check_response "$result" "\"code\": 0"
 
@@ -131,6 +136,7 @@ test_divider
 echo "Certify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} with matter certification"
 echo "dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$matter_certification_type" --certificationDate="$certification_date" --from $zb_account --yes"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$matter_certification_type" --certificationDate="$certification_date"  --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 echo "$result"
 check_response "$result" "\"code\": 0"
 
@@ -139,6 +145,7 @@ test_divider
 echo "ReCertify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} by different account"
 zigbee_certification_type="zigbee"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format  --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $second_zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 303"
 check_response "$result" "already certified on the ledger"
 echo "$result"
@@ -148,6 +155,7 @@ test_divider
 echo "ReCertify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format  SV: ${sv} by same account"
 zigbee_certification_type="zigbee"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format  --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date"  --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 303"
 check_response "$result" "already certified on the ledger"
 echo "$result"
@@ -249,6 +257,7 @@ revocation_reason="some reason"
 echo "Revoke Certification for Model with VID: $vid_in_hex_format PID: $pid_in_hex_format SV: ${sv} from the past"
 revocation_date_past="2020-01-01T00:00:00Z"
 result=$(echo "$passphrase" | dcld tx compliance revoke-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --revocationDate="$revocation_date_past" --reason "$revocation_reason" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 302"
 check_response "$result" "must be after"
 echo "$result"
@@ -259,6 +268,7 @@ test_divider
 echo "Revoke Certification for Model with VID: $vid_in_hex_format PID: $pid_in_hex_format SV: ${sv} "
 revocation_date="2020-02-02T02:20:20Z"
 result=$(echo "$passphrase" | dcld tx compliance revoke-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --revocationDate="$revocation_date" --reason "$revocation_reason" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 0"
 echo "$result"
 
@@ -314,6 +324,7 @@ test_divider
 echo "Again Certify Model with VID: $vid_in_hex_format PID: $pid_in_hex_format SV: ${sv}"
 certification_date="2020-03-03T00:00:00Z"
 result=$(echo "$passphrase" | dcld tx compliance certify-model --vid=$vid_in_hex_format --pid=$pid_in_hex_format --softwareVersion=$sv --softwareVersionString=$svs --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
 check_response "$result" "\"code\": 0"
 echo "$result"