Changes following Ola's review

cardano-community · Nov 25, 2024 · e0b3a67 · e0b3a67
1 parent 4923db4
commit e0b3a67
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/Scripts/cntools-changelog.md b/docs/Scripts/cntools-changelog.md
@@ -6,6 +6,10 @@ All notable changes to this tool will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [13.3.1] - 2024-11-25
+#### Fixed
+- Corrected KES expiration information calculation on cntools launch, pool -> list and pool -> show screens
+
 ## [13.3.0] - 2024-11-21
 #### Added
 - Own votes cast (SPO|DRep|CC) shown in proposal list.

diff --git a/scripts/cnode-helper-scripts/cntools.library b/scripts/cnode-helper-scripts/cntools.library
@@ -15,7 +15,7 @@ CNTOOLS_MAJOR_VERSION=13
 # Minor: Changes and features of minor character that can be applied without breaking existing functionality or workflow
 CNTOOLS_MINOR_VERSION=3
 # Patch: Backwards compatible bug fixes. No additional functionality or major changes
-CNTOOLS_PATCH_VERSION=0
+CNTOOLS_PATCH_VERSION=1
 
 CNTOOLS_VERSION="${CNTOOLS_MAJOR_VERSION}.${CNTOOLS_MINOR_VERSION}.${CNTOOLS_PATCH_VERSION}"
 DUMMYFEE=20000
@@ -762,7 +762,7 @@ isPoolRegistered() {
   unset p_active_epoch_no p_vrf_key_hash p_margin p_fixed_cost p_pledge p_reward_addr p_owners p_relays p_meta_url p_meta_hash p_meta_json p_pool_status
   unset p_retiring_epoch p_op_cert p_op_cert_counter p_active_stake p_epoch_block_cnt p_live_stake p_live_delegators p_live_saturation
   if [[ ${CNTOOLS_MODE} != "LIGHT" ]]; then
-    [[ -f "${POOL_FOLDER}/${1}/${POOL_REGCERT_FILENAME}" ]] && return 2 || (rm -rf "${POOL_FOLDER}/${1}/${POOL_CURRENT_KES_START}" && return 1)
+    [[ -f "${POOL_FOLDER}/${1}/${POOL_REGCERT_FILENAME}" ]] && return 2 || (rm -f "${POOL_FOLDER}/${1}/${POOL_CURRENT_KES_START}" && return 1)
   else
     getPoolID "$1"
     HEADERS=("${KOIOS_API_HEADERS[@]}" -H "Content-Type: application/json")

diff --git a/scripts/cnode-helper-scripts/cntools.sh b/scripts/cnode-helper-scripts/cntools.sh
@@ -241,8 +241,8 @@ if [[ ${CHECK_KES} = true ]]; then
       continue
     fi
 
-    unset pool_kes_start
-    unset remaining_kes_periods && pool_kes_start="$(cat "${pool}/${POOL_CURRENT_KES_START}")"  
+    unset remaining_kes_periods
+    pool_kes_start="$(cat "${pool}/${POOL_CURRENT_KES_START}")"  
 
     if ! kesExpiration ${pool_kes_start}; then println ERROR "${FG_RED}ERROR${NC}: failure during KES calculation for ${FG_GREEN}$(basename ${pool})${NC}" && waitToProceed && continue; fi