cannation update 1

cannationproject · Apr 12, 2017 · db2e6ae · db2e6ae
1 parent 9380f57
commit db2e6ae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/release/win32-qt/Cannation-qt-win32.zip b/release/win32-qt/Cannation-qt-win32.zip
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -28,6 +28,7 @@ namespace Checkpoints
     static MapCheckpoints mapCheckpoints =
         boost::assign::map_list_of
         ( 0,      hashGenesisBlock )
+        ( 1,      uint256("0x000009dd06d971a62d62acb997c48a502b5cb7c7dd7e6c913fb28ef31101c472"))
     ;
 
     // TestNet has no checkpoints

diff --git a/src/net.cpp b/src/net.cpp
@@ -1229,7 +1229,8 @@ void MapPort()
 // The first name is used as information source for addrman.
 // The second name should resolve to a list of seed addresses.
 static const char *strDNSSeed[][2] = {
-    {"walletbuilders.com", "node.walletbuilders.com"},
+    {"seed1.thecryptochat.net", "195.74.52.227"},
+    {"seed2.thecryptochat.net", "149.56.154.65"},
 };
 
 void ThreadDNSAddressSeed(void* parg)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -135,22 +135,18 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
 #endif
     centralLayout->addWidget(centralStackedWidget);
 
-
     setCentralWidget(centralWidget);
 
     // Create status bar
     statusBar();
 
     // Status bar notification icons
-    //QFrame *frameBlocks = new QFrame();
-    QWidget *frameBlocks = new QWidget();
+    QFrame *frameBlocks = new QFrame();
     frameBlocks->setContentsMargins(0,0,0,0);
-    // frameBlocks->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-    frameBlocks->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    frameBlocks->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
     QHBoxLayout *frameBlocksLayout = new QHBoxLayout(frameBlocks);
     frameBlocksLayout->setContentsMargins(3,0,3,0);
     frameBlocksLayout->setSpacing(3);
-    frameBlocksLayout->setAlignment(Qt::AlignHCenter);
     labelEncryptionIcon = new QLabel();
     labelStakingIcon = new QLabel();
     labelConnectionsIcon = new QLabel();
@@ -164,7 +160,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelBlocksIcon);
     frameBlocksLayout->addStretch();
-    toolbar->addWidget(frameBlocks);
 
     if (GetBoolArg("-staking", true))
     {
@@ -359,12 +354,11 @@ static QWidget* makeToolBarSpacer()
 
 void BitcoinGUI::createToolBars()
 {
-    //QToolBar *toolbar = addToolBar(tr("Tabs toolbar"));
     toolbar = new QToolBar(tr("Tabs toolbar"));
     toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     toolbar->setContextMenuPolicy(Qt::PreventContextMenu);
     toolbar->setObjectName("tabs");
-    toolbar->setIconSize(QSize(16,16));
+    toolbar->setIconSize(QSize(24,24));
 
     QLabel* header = new QLabel();
     header->setMinimumSize(142, 142);
@@ -373,6 +367,7 @@ void BitcoinGUI::createToolBars()
     header->setMaximumSize(142,142);
     header->setScaledContents(true);
     toolbar->addWidget(header);
+
     toolbar->addAction(overviewAction);
     toolbar->addAction(sendCoinsAction);
     toolbar->addAction(receiveCoinsAction);

diff --git a/src/version.h b/src/version.h
@@ -30,21 +30,21 @@ static const int DATABASE_VERSION = 70509;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60013;
+static const int PROTOCOL_VERSION = 60015;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
 
 // disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 209;
+static const int MIN_PEER_PROTO_VERSION = 60015;
 
 // nTime field added to CAddress, starting with this version;
 // if possible, avoid requesting addresses nodes older than this
 static const int CADDR_TIME_VERSION = 31402;
 
 // only request blocks from nodes outside this range of versions
 static const int NOBLKS_VERSION_START = 60002;
-static const int NOBLKS_VERSION_END = 60006;
+static const int NOBLKS_VERSION_END = 60014;
 
 // BIP 0031, pong message, is enabled for all versions AFTER this one
 static const int BIP0031_VERSION = 60000;