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]) 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: 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 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; 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