Skip to content

fix-start-servicenode-buttons: Applied this fix from BlockDX to XC, e… #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sawtoothgeek wants to merge 1 commit into
base: 3.0.05-dev
Choose a base branch
from
Open

fix-start-servicenode-buttons: Applied this fix from BlockDX to XC, e… #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/qt/servicenodelist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ ServicenodeList::ServicenodeList(QWidget* parent) : QWidget(parent),
{
ui->setupUi(this);

ui->startButton->setEnabled(false);
ui->startAllButton->setEnabled(true);
ui->startButton->setEnabled(true);
ui->startMissingButton->setEnabled(true);

int columnAliasWidth = 100;
int columnAddressWidth = 200;
Expand All @@ -42,18 +44,16 @@ ServicenodeList::ServicenodeList(QWidget* parent) : QWidget(parent),

ui->tableWidgetMyServicenodes->setContextMenuPolicy(Qt::CustomContextMenu);

//hided start alias buttons until fix/testing
ui->startAllButton->setVisible(false);
ui->startButton->setVisible(false);
ui->startMissingButton->setVisible(false);
ui->startAllButton->setVisible(true);
ui->startButton->setVisible(true);
ui->startMissingButton->setVisible(true);

QAction* startAliasAction = new QAction(tr("Start alias"), this);
contextMenu = new QMenu();
contextMenu->addAction(startAliasAction);

//hided hided start alias context menu until fix/testing
// connect(ui->tableWidgetMyServicenodes, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenu(const QPoint&)));
// connect(startAliasAction, SIGNAL(triggered()), this, SLOT(on_startButton_clicked()));
connect(ui->tableWidgetMyServicenodes, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenu(const QPoint&)));
connect(startAliasAction, SIGNAL(triggered()), this, SLOT(on_startButton_clicked()));

timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(updateMyNodeList()));
Expand Down
5 changes: 3 additions & 2 deletions src/servicenode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,11 @@ std::string CServicenode::GetStatus()

bool CServicenode::IsValidNetAddr()
{
SetReachable(Network::NET_IPV4, true);

// TODO: regtest is fine with any addresses for now,
// should probably be a bit smarter if one day we start to implement tests for this
return Params().NetworkID() == CBaseChainParams::REGTEST ||
(IsReachable(addr) && addr.IsRoutable());
return Params().NetworkID() == CBaseChainParams::REGTEST || (IsReachable(addr) && addr.IsRoutable());
}

CServicenodeBroadcast::CServicenodeBroadcast()
Expand Down
2 changes: 2 additions & 0 deletions src/test/transaction_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <boost/assign/list_of.hpp>
#include "json/json_spirit_writer_template.h"

#define MAX_OP_RETURN_RELAY 10

using namespace std;
using namespace json_spirit;
using namespace boost::algorithm;
Expand Down