From 368e48cb16476bf1b5e29ed166aed6e53b86f963 Mon Sep 17 00:00:00 2001 From: Odysseas Gabrielides Date: Tue, 28 Feb 2023 17:55:37 +0200 Subject: [PATCH 1/5] bump rc3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d4230c862d..e605170270 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 19) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 2) +define(_CLIENT_VERSION_RC, 3) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2023) define(_COPYRIGHT_HOLDERS,[The %s developers]) From c83d4881df26bb303882ecd453dacbcf2212c695 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Tue, 28 Feb 2023 12:11:07 +0700 Subject: [PATCH 2/5] chrore: bump version in gitian to 19 (#5220) Name of some files in gitian's build contains "18" instead 19. ## Issue being fixed or feature implemented ## What was done? Version bumped in gitian's related configs ## How Has This Been Tested? Will be tested with next RC of v19 ## Breaking Changes No breaking changes ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation @PastaPastaPasta may you update release TODO checklist, please? - [x] I have assigned this pull request to a milestone --- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 4a14a0ce44..809e0d5870 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "dash-linux-18" +name: "dash-linux-19" enable_cache: true distro: "ubuntu" suites: diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 6c8dfac38c..0a2102887f 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "dash-osx-18" +name: "dash-osx-19" enable_cache: true distro: "ubuntu" suites: diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 5b1b096d29..cbf76eb509 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "dash-win-18" +name: "dash-win-19" enable_cache: true distro: "ubuntu" suites: From db978cef54cf15fb38626281114582e3e37af2ad Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Mon, 27 Feb 2023 20:50:02 +0300 Subject: [PATCH 3/5] fix(qt): Overview page should always be accessible (#5221) ## Issue being fixed or feature implemented Overview page shows either wallet info or "Create wallet" button. Unlike in bitcoin we can switch to other pages even when no wallets are enabled (because we have Masternodes and Governance tabs) but then there is no way to return back to Overview page. ## What was done? Keep Overview tab always enabled. Make a no-wallet groupbox a member of `WalletFrame` and add logic to switch to it when needed. ## How Has This Been Tested? `./src/qt/dash-qt --regtest --nowallet` ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [ ] I have assigned this pull request to a milestone PS. kudos to @thephez for reporting :) --- src/qt/bitcoingui.cpp | 2 +- src/qt/walletframe.cpp | 9 +++++++-- src/qt/walletframe.h | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 32ec843b02..9851801a9f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -939,7 +939,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled) { #ifdef ENABLE_WALLET if (walletFrame != nullptr) { - overviewButton->setEnabled(enabled); + // NOTE: overviewButton is always enabled sendCoinsButton->setEnabled(enabled); coinJoinCoinsButton->setEnabled(enabled && clientModel->coinJoinOptions().isEnabled()); receiveCoinsButton->setEnabled(enabled); diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 5a478109d4..5864820499 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -14,7 +14,6 @@ #include -#include #include #include #include @@ -32,7 +31,7 @@ WalletFrame::WalletFrame(BitcoinGUI* _gui) : walletFrameLayout->addWidget(walletStack); // hbox for no wallet - QGroupBox* no_wallet_group = new QGroupBox(walletStack); + no_wallet_group = new QGroupBox(walletStack); QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group); QLabel *noWallet = new QLabel(tr("No wallet has been loaded.\nGo to File > Open Wallet to load a wallet.\n- OR -")); @@ -172,6 +171,12 @@ void WalletFrame::gotoGovernancePage() void WalletFrame::gotoOverviewPage() { QMap::const_iterator i; + + if (mapWalletViews.empty()) { + walletStack->setCurrentWidget(no_wallet_group); + return; + } + for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) i.value()->gotoOverviewPage(); } diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 5fbd5ca4ad..d66225c5cf 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -6,6 +6,7 @@ #define BITCOIN_QT_WALLETFRAME_H #include +#include #include class BitcoinGUI; @@ -55,6 +56,7 @@ private: BitcoinGUI *gui; ClientModel *clientModel; QMap mapWalletViews; + QGroupBox* no_wallet_group; MasternodeList* masternodeListPage; GovernanceList* governanceListPage; From 088c8a55d2ac7d7e75223a05ed6f25ea994ab906 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Tue, 28 Feb 2023 04:13:01 +0700 Subject: [PATCH 4/5] fix: making builds of guix to produce same output whatever git config (#5222) Builds are different, because git command output are different: ## Issue being fixed or feature implemented in pr #5194 different OS produced different hashes of binary. That's due to different behaviour of this command: ```sh $ git rev-parse --short HEAD b3f242da14 - on my localhost Kubuntu 22.10 b3f242da1 - inside pastapastapasta's docker ``` ## What was done? This fix forces to git print always 12 character ## How Has This Been Tested? Run in different environment ## Breaking Changes No breaking changes ## Checklist: - [x] I have performed a self-review of my own code - [x] I have assigned this pull request to a milestone --- share/genbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/genbuild.sh b/share/genbuild.sh index 804d56effd..7e34390d78 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -31,7 +31,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$ fi # otherwise generate suffix from git, i.e. string like "59887e8-dirty" - GIT_COMMIT=$(git rev-parse --short HEAD) + GIT_COMMIT=$(git rev-parse --short=12 HEAD) git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-dirty" fi From 5826464fc96b7deca1af70ec729be84c3f19be6f Mon Sep 17 00:00:00 2001 From: Odysseas Gabrielides Date: Tue, 28 Feb 2023 17:59:57 +0200 Subject: [PATCH 5/5] chore: Bump MIN_MASTERNODE_PROTO_VERSION for v19 (#5223) ## Issue being fixed or feature implemented ## What was done? `MIN_MASTERNODE_PROTO_VERSION` was bumped to match latest `PROTOCOL_VERSION`. ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [x] I have assigned this pull request to a milestone --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 456b44d784..a2114db494 100644 --- a/src/version.h +++ b/src/version.h @@ -20,7 +20,7 @@ static const int INIT_PROTO_VERSION = 209; static const int MIN_PEER_PROTO_VERSION = 70215; //! minimum proto version of masternode to accept in DKGs -static const int MIN_MASTERNODE_PROTO_VERSION = 70221; +static const int MIN_MASTERNODE_PROTO_VERSION = 70227; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this