Merge pull request #5224 from ogabrielides/rc3_v19_bump

chore: bump version to rc.3
This commit is contained in:
PastaPastaPasta 2023-02-28 11:12:24 -06:00 committed by GitHub
commit ccea5abba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 9 deletions

View File

@ -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])

View File

@ -1,5 +1,5 @@
---
name: "dash-linux-18"
name: "dash-linux-19"
enable_cache: true
distro: "ubuntu"
suites:

View File

@ -1,5 +1,5 @@
---
name: "dash-osx-18"
name: "dash-osx-19"
enable_cache: true
distro: "ubuntu"
suites:

View File

@ -1,5 +1,5 @@
---
name: "dash-win-18"
name: "dash-win-19"
enable_cache: true
distro: "ubuntu"
suites:

View File

@ -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

View File

@ -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);

View File

@ -14,7 +14,6 @@
#include <cassert>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
@ -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<WalletModel*, WalletView*>::const_iterator i;
if (mapWalletViews.empty()) {
walletStack->setCurrentWidget(no_wallet_group);
return;
}
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->gotoOverviewPage();
}

View File

@ -6,6 +6,7 @@
#define BITCOIN_QT_WALLETFRAME_H
#include <QFrame>
#include <QGroupBox>
#include <QMap>
class BitcoinGUI;
@ -55,6 +56,7 @@ private:
BitcoinGUI *gui;
ClientModel *clientModel;
QMap<WalletModel*, WalletView*> mapWalletViews;
QGroupBox* no_wallet_group;
MasternodeList* masternodeListPage;
GovernanceList* governanceListPage;

View File

@ -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