From aca9cf91f4d0223066a888950384470048f05a9f Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Wed, 19 Apr 2023 18:24:57 -0400 Subject: [PATCH 1/4] Add missing initialization of fCompressed in dumpprivkey --- src/keystore.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/keystore.h b/src/keystore.h index 7c28d1f727..cb6ab524a3 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -40,6 +40,7 @@ class CKeyStore CKey key; if (!GetKey(address, key)) return false; + fCompressed = key.IsCompressed(); vchSecret.assign(key.begin(), key.end()); return true; } From 86741013c1cf3ca438446784e7deb5c85ce741af Mon Sep 17 00:00:00 2001 From: div72 <60045611+div72@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:44:23 +0300 Subject: [PATCH 2/4] key: derive compression status from key length --- src/key.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/key.cpp b/src/key.cpp index 68922d2244..cf0f9fb104 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -284,7 +284,7 @@ bool CKey::SignCompact(const uint256 &hash, std::vector& vchSig) bool CKey::Load(const CPrivKey &seckey, const CPubKey &vchPubKey, bool fSkipCheck=false) { if (!ec_seckey_import_der(secp256k1_context_sign, (unsigned char*)begin(), seckey.data(), seckey.size())) return false; - fCompressed = vchPubKey.IsCompressed(); + fCompressed = seckey.size() == CKey::COMPRESSED_SIZE; fValid = true; if (fSkipCheck) From bdb3367f51edbf858d260a380a23896d7b6f8f85 Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Fri, 21 Apr 2023 13:38:39 -0400 Subject: [PATCH 3/4] Update changelog for 5.4.4.0 release. --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c353684138..6dd85d4f21 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/). +## [5.4.4.0] 2023-04-21, leisure + +### Added +none + +### Changed +none + +### Removed +none + +### Fixed + - wallet, rpc: Add missing assignment of fCompressed in dumpprivkey #2680 (@jamescowens) + ## [5.4.3.0] 2023-04-05, leisure ### Added From 71684c52db5833167fcb1fb40d5d51071453e7d8 Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Fri, 21 Apr 2023 13:40:10 -0400 Subject: [PATCH 4/4] Update version to 5.4.4.0 for release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5b123885ca..295ecb2d22 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 5) define(_CLIENT_VERSION_MINOR, 4) -define(_CLIENT_VERSION_REVISION, 3) +define(_CLIENT_VERSION_REVISION, 4) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2023)