From 03fa688f1cfacdba6f04551a029740f24f424726 Mon Sep 17 00:00:00 2001
From: "Ola [AHLNET]" <ola.ahlman@gmail.com>
Date: Sun, 27 Oct 2024 13:32:22 +0100
Subject: [PATCH] CNTools v13.2.3 (#1829)

## Description
pool registration edge case fix

Closes #1827
---
 docs/Scripts/cntools-changelog.md            | 4 ++++
 scripts/cnode-helper-scripts/cntools.library | 8 ++++++--
 scripts/cnode-helper-scripts/cntools.sh      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/Scripts/cntools-changelog.md b/docs/Scripts/cntools-changelog.md
index 4931ebd1a..64ae68d38 100644
--- 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.2.3] - 2024-10-16
+#### Fixed
+- Edge case fix for pool registration when cardano-hw-cli is present
+
 ## [13.2.2] - 2024-09-23
 #### Fixed
 - URL for share.koios.rest to download catalyst-toolbox
diff --git a/scripts/cnode-helper-scripts/cntools.library b/scripts/cnode-helper-scripts/cntools.library
index e77ef0011..29c655be1 100644
--- 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=2
 # Patch: Backwards compatible bug fixes. No additional functionality or major changes
-CNTOOLS_PATCH_VERSION=2
+CNTOOLS_PATCH_VERSION=3
 
 CNTOOLS_VERSION="${CNTOOLS_MAJOR_VERSION}.${CNTOOLS_MINOR_VERSION}.${CNTOOLS_PATCH_VERSION}"
 DUMMYFEE=20000
@@ -3382,7 +3382,11 @@ registerPool() {
   )
   [[ -n ${owner_delegation_cert} ]] && build_args+=( --certificate-file "${owner_delegation_cert}" )
 
-  if ! buildTx "${TMP_DIR}/tx.raw"; then return 1; fi
+  if [[ ${hw_owner_wallets} = 'Y' || ${hw_reward_wallet} = 'Y' || ${isHWpool} = 'Y' ]]; then
+    buildTx "${TMP_DIR}/tx.raw" || return 1
+  else
+    buildTx || return 1
+  fi
   
   if [[ ${op_mode} = "hybrid" ]]; then
     if ! buildOfflineJSON "Pool Registration"; then return 1; fi
diff --git a/scripts/cnode-helper-scripts/cntools.sh b/scripts/cnode-helper-scripts/cntools.sh
index f975c04c8..0ae165def 100755
--- a/scripts/cnode-helper-scripts/cntools.sh
+++ b/scripts/cnode-helper-scripts/cntools.sh
@@ -199,7 +199,7 @@ if [[ ${CNTOOLS_MODE} != "OFFLINE" ]]; then
       clear
       if [[ ! -f "${PARENT}/cntools-changelog.md" ]]; then
         # special case for first installation or 5.0.0 upgrade, print release notes until previous major version
-        echo -e "~ CNTools - What's New ~\n\n" "$(sed -n "/\[${CNTOOLS_MAJOR_VERSION}\.${CNTOOLS_MINOR_VERSION}\.${CNTOOLS_PATCH_VERSION}\]/,/\[$((CNTOOLS_MAJOR_VERSION-1))\.[0-9]\.[0-9]\]/p" "${TMP_DIR}"/cntools-changelog.md | head -n -2)" | less -X
+        echo -e "~ CNTools - What's New ~\n\n" "$(sed -n "/\[${CNTOOLS_MAJOR_VERSION}\.${CNTOOLS_MINOR_VERSION}\.${CNTOOLS_PATCH_VERSION}\]/,/\[$((CNTOOLS_MAJOR_VERSION-1))\.[0-9]\.[0-9]\]/p" "${TMP_DIR}"/cntools-changelog.md | head -n -2)" "\n [Press 'q' to quit and proceed to CNTools main menu]\n" | less -X
       else
         # print release notes from current until previously installed version
         [[ $(cat "${PARENT}/cntools-changelog.md") =~ \[([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\] ]]