Skip to content

Commit

Permalink
CNTools v13.2.3 (#1829)
Browse files Browse the repository at this point in the history
## Description
pool registration edge case fix

Closes #1827
  • Loading branch information
Scitz0 authored Oct 27, 2024
1 parent 97e37fa commit 03fa688
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions docs/Scripts/cntools-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions scripts/cnode-helper-scripts/cntools.library
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/cnode-helper-scripts/cntools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:]]+)\] ]]
Expand Down

0 comments on commit 03fa688

Please sign in to comment.