Permalink
Browse files

3.5.5.9-Leisure

Gridcoin Research 3.5.5.9/MSI=39.7
Leisure Upgrade

- Populate Neural magnitude value that is currently 0 (from Derp)
- Git-Jiros push: allow GRC to build easier on OSX
- Remove unused feature for Carakas RPM builds, also merged Carakas
change for miniupnpc.
- Handle orphans better to allow new users to sync easier
- Add OP Return codes when they are enabled (may have to wait til the
Mandatory, TBD)
- Added new key for high DPI monitor support (IE Windows 10, certain
flavors of Linux - text is cut off) - if so add this key to the config:
fontsize=5
- Added new RPC command to generate burn addresses:
execute newburnaddress YourVanityString
(This will make a burn address in Prod or Testnet).
  • Loading branch information...
1 parent ae4cd11 commit 180266e40741789c48159a085bc9128b49a08675 @gridcoin committed Mar 18, 2016
View
Oops, something went wrong.
View
Oops, something went wrong.
@@ -1120,19 +1120,19 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Gridcoin Research"
- "ProductCode" = "8:{2DD66550-4231-4CB1-968E-2818CEB17912}"
- "PackageCode" = "8:{5A1EB615-F127-4708-B7E3-9A42B95BCD18}"
+ "ProductCode" = "8:{A782D88D-D4EC-4DF7-AB26-92C52942DAA5}"
+ "PackageCode" = "8:{9C44139D-F9DE-4E52-8B0E-F07322AC730F}"
"UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:39.6"
+ "ProductVersion" = "8:39.7"
"Manufacturer" = "8:GridcoinResearch"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
- "Title" = "8:Gridcoin Research 39.6"
+ "Title" = "8:Gridcoin Research 39.7"
"Subject" = "8:"
"ARPCONTACT" = "8:The Gridcoin Developers"
"Keywords" = "8:Gridcoin Research"
@@ -96,9 +96,8 @@ Module modPersistedDataSystem
lstCPIDs.Sort(Function(x, y) x.PrimaryKey.CompareTo(y.PrimaryKey))
Dim sOut As String = ""
For Each cpid As Row In lstCPIDs
- Dim dNeuralMagnitude As Double = 0
Dim sRow As String = cpid.PrimaryKey + "," + Num(cpid.Magnitude) _
- + "," + Num(dNeuralMagnitude) + "," + Num(cpid.RAC) _
+ + "," + Num(cpid.Magnitude) + "," + Num(cpid.RAC) _
+ "," + Trim(cpid.Synced) + "," + Trim(cpid.DataColumn4) _
+ "," + Trim(cpid.DataColumn5) + "," + Trim(cpid.Witnesses) + ";"
sOut += sRow
@@ -11,7 +11,6 @@ QT += qaxcontainer
#QT += axcontainer
QT += axserver
QT += widgets
-QT += webkit network
greaterThan(QT_MAJOR_VERSION, 4) {
@@ -169,7 +168,6 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/upgradedialog.h \
src/qt/editaddressdialog.h \
src/qt/bitcoinaddressvalidator.h \
- src/gridcoinbrowser.h \
src/alert.h \
src/addrman.h \
src/base58.h \
@@ -256,7 +254,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/upgradedialog.cpp \
src/qt/editaddressdialog.cpp \
src/qt/bitcoinaddressvalidator.cpp \
- src/gridcoinbrowser.cpp \
src/alert.cpp \
src/version.cpp \
src/sync.cpp \
@@ -425,6 +422,8 @@ macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
macx:QT -= qaxcontainer axserver widgets
macx:CONFIG -= qaxcontainer
+macx:CONFIG += link_pkgconfig
+macx:PKGCONFIG += libzip
# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$CURL_INCLUDE_PATH $$LIBZIP_INCLUDE_PATH
@@ -14,7 +14,6 @@ INPUT(
./build/upgradedialog.o
./build/editaddressdialog.o
./build/bitcoinaddressvalidator.o
-./build/gridcoinbrowser.o
./build/alert.o
./build/version.o
./build/sync.o
@@ -88,7 +87,6 @@ INPUT(
./build/moc_upgradedialog.o
./build/moc_editaddressdialog.o
./build/moc_bitcoinaddressvalidator.o
-./build/moc_gridcoinbrowser.o
./build/moc_clientmodel.o
./build/moc_guiutil.o
./build/moc_trafficgraphwidget.o
@@ -14,7 +14,6 @@ INPUT(
./build/upgradedialog.o
./build/editaddressdialog.o
./build/bitcoinaddressvalidator.o
-./build/gridcoinbrowser.o
./build/alert.o
./build/version.o
./build/sync.o
@@ -88,7 +87,6 @@ INPUT(
./build/moc_upgradedialog.o
./build/moc_editaddressdialog.o
./build/moc_bitcoinaddressvalidator.o
-./build/moc_gridcoinbrowser.o
./build/moc_clientmodel.o
./build/moc_guiutil.o
./build/moc_trafficgraphwidget.o
View
@@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 5
#define CLIENT_VERSION_REVISION 5
-#define CLIENT_VERSION_BUILD 8
+#define CLIENT_VERSION_BUILD 9
// Converts the parameter X to a string after macro replacement on X has been performed.
// Don't merge these into one macro!
View
@@ -30,8 +30,14 @@
int GetDayOfYear();
extern std::string NodeAddress(CNode* pfrom);
+extern std::string ConvertBinToHex(std::string a);
+extern std::string ConvertHexToBin(std::string a);
+
extern std::string UnpackBinarySuperblock(std::string sBlock);
extern std::string PackBinarySuperblock(std::string sBlock);
+extern std::vector<unsigned char> StringToVector(std::string sData);
+
+
extern double GetStandardDeviation(std::string sPriceHistory);
extern double GetVolatility(std::string sPriceHistory);
bool GetExpiredOption(std::string& rsRecipient, double& rdSinglePrice, double& rdAmountOwed, std::string& rsOpra);
@@ -281,9 +287,9 @@ unsigned int nModifierInterval = 10 * 60; // time to elapse before new modifier
bool bCryptoLotteryEnabled = true;
bool bRemotePaymentsEnabled = false;
bool bNewbieFeatureEnabled = false;
+bool bOPReturnEnabled = false;
bool bOptionPaymentsEnabled = false;
-
// Gridcoin:
int nCoinbaseMaturity = 100;
CBlockIndex* pindexGenesisBlock = NULL;
@@ -5008,7 +5014,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock, bool generated_by_me)
if (!mapBlockIndex.count(pblock->hashPrevBlock))
{
//12-5-2015
- bool fProcess = (pfrom->nTrust >= 0 || OutOfSyncByAge());
+ bool fProcess = (pfrom->nTrust >= 0);
printf("ProcessBlock: ORPHAN BLOCK, WillProcess %s, prev=%s \r\n", YesNo(fProcess).c_str(), pblock->hashPrevBlock.ToString().c_str());
// Note that you will have to accept orphans to stay in sync since getblock requests are not filled in order...
// If this node is trustworthy:
@@ -5293,6 +5299,7 @@ bool LoadBlockIndex(bool fAllowNew)
nNewIndex2 = 36500;
bRemotePaymentsEnabled = false;
bNewbieFeatureEnabled = true;
+ bOPReturnEnabled = false;
bOptionPaymentsEnabled = false;
//1-24-2016
MAX_OUTBOUND_CONNECTIONS = (int)GetArg("-maxoutboundconnections", 8);
@@ -8091,18 +8098,18 @@ bool ProcessMessages(CNode* pfrom)
//1-28-2016
double node_duplicates = cdbl(ReadCache("duplicates",NodeAddress(pfrom)),0) + 1;
WriteCache("duplicates",NodeAddress(pfrom),RoundToString(node_duplicates,0),GetAdjustedTime());
- if ( (node_duplicates > 5 && !fTestNet) || (node_duplicates > 5 && fTestNet && !OutOfSyncByAge()) )
+ if ( (node_duplicates > 350 && !fTestNet && !OutOfSyncByAge()) || (node_duplicates > 350 && fTestNet && !OutOfSyncByAge()) )
{
printf(" Dupe (misbehaving) %s %s ",NodeAddress(pfrom).c_str(),Peek.c_str());
- pfrom->Misbehaving(10);
+ pfrom->Misbehaving(1);
pfrom->fDisconnect = true;
WriteCache("duplicates",NodeAddress(pfrom),"0",GetAdjustedTime());
return false;
}
}
else
{
- double node_duplicates = cdbl(ReadCache("duplicates",NodeAddress(pfrom)),0) - 1;
+ double node_duplicates = cdbl(ReadCache("duplicates",NodeAddress(pfrom)),0) - 15;
if (node_duplicates < 1) node_duplicates = 0;
WriteCache("duplicates",NodeAddress(pfrom),RoundToString(node_duplicates,0),GetAdjustedTime());
}
View
@@ -150,6 +150,7 @@ extern int64_t COIN_YEAR_REWARD;
extern bool bCryptoLotteryEnabled;
extern bool bRemotePaymentsEnabled;
extern bool bNewbieFeatureEnabled;
+extern bool bOPReturnEnabled;
extern bool bOptionPaymentsEnabled;
// Settings
View
@@ -18,10 +18,10 @@
#endif
#ifdef USE_UPNP
-#include <miniwget.h>
-#include <miniupnpc.h>
-#include <upnpcommands.h>
-#include <upnperrors.h>
+ #include <miniwget.h>
+ #include <miniupnpc.h>
+ #include <upnpcommands.h>
+ #include <upnperrors.h>
#endif
using namespace std;
View
@@ -26,7 +26,6 @@
#include "upgradedialog.h"
#include "upgrader.h"
-#include "gridcoinbrowser.h"
#include "sendcoinsdialog.h"
#include "signverifymessagedialog.h"
#include "optionsdialog.h"
@@ -178,6 +177,13 @@ extern int ReindexBlocks();
bool OutOfSync();
+QString ToQstring(std::string s)
+{
+ QString str1 = QString::fromUtf8(s.c_str());
+ return str1;
+}
+
+
BitcoinGUI::BitcoinGUI(QWidget *parent):
@@ -197,7 +203,14 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
{
setFixedSize(980, 550);
setWindowTitle(tr("Gridcoin") + " " + tr("Wallet"));
- qApp->setStyleSheet("QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(69,65,63);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(169,192,7); } #toolbar2 { border:none;width:10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(210,220,7), stop: 1 rgb(98,116,3)); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(69,65,63); text-align: left; color: rgb(169,192,7); min-width:160px; max-width:160px;} QToolBar QToolButton:hover {background-color:qlineargradient(x1: 0, y1: 0, x2: 2, y2: 2,stop: 0 rgb(69,65,63), stop: 1 rgb(216,252,251),stop: 2 rgb(59,62,65));} QToolBar QToolButton { font-family:Century Gothic;padding-left:20px;padding-right:200px;padding-top:7px;padding-bottom:7px; width:100%; color: rgb(169,192,7); text-align: left; background-color: rgb(69,65,63) } #labelMiningIcon { padding-left:5px;font-family:Century Gothic;width:100%;font-size:10px;text-align:center;color: rgb(169,192,7); } QMenu { background: rgb(69,65,63); color: rgb(169,192,7); padding-bottom:10px; } QMenu::item { color: rgb(169,192,7); background-color: transparent; } QMenu::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); } QMenuBar { background: rgb(69,65,63); color: rgb(169,192,7); } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:8px;padding-left:15px;padding-right:15px;color: rgb(169,192,7); background-color: transparent; } QMenuBar::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); }");
+ //3-17-2016
+ double dFontSize = cdbl(GetArgument("fontsize", "10"),0);
+ std::string sFontSize10 = RoundToString(dFontSize,0);
+ std::string sFontSize12 = RoundToString(dFontSize+2,0);
+ std::string sMainWindowHTML = "QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(69,65,63);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(169,192,7); } #toolbar2 { border:none;width:10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(210,220,7), stop: 1 rgb(98,116,3)); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(69,65,63); text-align: left; color: rgb(169,192,7); min-width:160px; max-width:160px;} QToolBar QToolButton:hover {background-color:qlineargradient(x1: 0, y1: 0, x2: 2, y2: 2,stop: 0 rgb(69,65,63), stop: 1 rgb(216,252,251),stop: 2 rgb(59,62,65));} QToolBar QToolButton { font-family:Century Gothic;padding-left:20px;padding-right:200px;padding-top:7px;padding-bottom:7px; width:100%; color: rgb(169,192,7); text-align: left; background-color: rgb(69,65,63) } #labelMiningIcon { padding-left:5px;font-family:Century Gothic;width:100%;font-size:" + sFontSize10 + "px;text-align:center;color: rgb(169,192,7); } QMenu { background: rgb(69,65,63); color: rgb(169,192,7); padding-bottom:10px; } QMenu::item { color: rgb(169,192,7); background-color: transparent; } QMenu::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); } QMenuBar { background: rgb(69,65,63); color: rgb(169,192,7); } QMenuBar::item { font-size:" + sFontSize12 + "px;padding-bottom:8px;padding-top:8px;padding-left:15px;padding-right:15px;color: rgb(169,192,7); background-color: transparent; } QMenuBar::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(69,65,63), stop: 1 rgb(98,116,3)); }";
+
+
+ qApp->setStyleSheet(ToQstring(sMainWindowHTML));
#ifndef Q_OS_MAC
qApp->setWindowIcon(QIcon(":icons/bitcoin"));
@@ -441,15 +454,6 @@ int DownloadBlocks()
-
-QString ToQstring(std::string s)
-{
- QString str1 = QString::fromUtf8(s.c_str());
- return str1;
-}
-
-
-
int RestartClient()
{
if (!bGlobalcomInitialized) return 0;
@@ -953,9 +957,9 @@ void BitcoinGUI::createActions()
newUserWizardAction->setStatusTip(tr("New User Wizard"));
newUserWizardAction->setMenuRole(QAction::TextHeuristicRole);
- browserAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Browser"), this);
- browserAction->setStatusTip(tr("Browser"));
- browserAction->setMenuRole(QAction::TextHeuristicRole);
+ //browserAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Browser"), this);
+ //browserAction->setStatusTip(tr("Browser"));
+ //browserAction->setMenuRole(QAction::TextHeuristicRole);
votingAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Voting"), this);
votingAction->setStatusTip(tr("Voting"));
@@ -1028,7 +1032,7 @@ void BitcoinGUI::createActions()
connect(galazaAction, SIGNAL(triggered()), this, SLOT(galazaClicked()));
connect(newUserWizardAction, SIGNAL(triggered()), this, SLOT(newUserWizardClicked()));
- connect(browserAction, SIGNAL(triggered()), this, SLOT(browserClicked()));
+ //connect(browserAction, SIGNAL(triggered()), this, SLOT(browserClicked()));
}
@@ -1094,7 +1098,7 @@ void BitcoinGUI::createMenuBar()
qmAdvanced->addAction(tickerAction);
qmAdvanced->addAction(ticketListAction);
qmAdvanced->addAction(newUserWizardAction);
- qmAdvanced->addAction(browserAction);
+ //qmAdvanced->addAction(browserAction);
std::string GalazaEnabled = GetArgument("galazaenabled", "false");
@@ -1499,8 +1503,6 @@ bool CreateNewConfigFile(std::string boinc_email)
myConfig << row;
row = "addnode=gridcoin.asia \r\n";
myConfig << row;
- row = "addnode=sepulcher.wha.la \r\n";
- myConfig << row;
row = "addnode=grcmagnitude.com \r\n";
myConfig << row;
myConfig.close();
@@ -1568,7 +1570,6 @@ void BitcoinGUI::NewUserWizard()
//Force some addnodes in to get user started
ForceInAddNode("node.gridcoin.us");
ForceInAddNode("gridcoin.asia");
- ForceInAddNode("sepulcher.wha.la");
ForceInAddNode("grcmagnitude.com");
ForceInAddNode("amsterdam.grcnode.co.uk");
ForceInAddNode("london.grcnode.co.uk");
@@ -1766,7 +1767,7 @@ void BitcoinGUI::ticketListClicked()
#endif
}
-
+/*
void BitcoinGUI::browserClicked()
{
QUrl url;
@@ -1775,6 +1776,7 @@ void BitcoinGUI::browserClicked()
browser->showMaximized();
// Note: Some compact OS's may require browser->show();
}
+*/
void BitcoinGUI::foundationClicked()
{
View
@@ -223,8 +223,7 @@ private slots:
void faqClicked();
void tickerClicked();
- void browserClicked();
-
+
void ticketListClicked();
void galazaClicked();
void newUserWizardClicked();
Oops, something went wrong.

0 comments on commit 180266e

Please sign in to comment.