Brand update

README.md

@@ -1,4 +1,4 @@
-Dinero Core staging tree 1.0.0.5
+Dinero Core staging tree 1.0.1.0
 ===============================
 
 `master:` [![Build Status](https://travis-ci.org/dinerocoin/dinero.svg?branch=master)](https://travis-ci.org/dinerocoin/dinero) `develop:` [![Build Status](https://travis-ci.org/dinerocoin/dinero.svg?branch=develop)](https://travis-ci.org/dinerocoin/dinero/branches)

configure.ac

@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 7)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Dinero Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dinerocoin/dinero/issues],[dinerocore])

qa/rpc-tests/test_framework/mininode.py

@@ -35,7 +35,7 @@
 import dinero_hash
 
 BIP0031_VERSION = 60000
-MY_VERSION = 70208  # current MIN_PEER_PROTO_VERSION
+MY_VERSION = 70209  # current MIN_PEER_PROTO_VERSION
 MY_SUBVERSION = b"/python-mininode-tester:0.0.2/"
 
 MAX_INV_SZ = 50000

src/chainparams.cpp

@@ -118,10 +118,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThreshold = 3226; // 80% of 4032
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000269381f52d8b0e"); //18800
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000002df95bef9048bc"); //35000
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x0000000000680ef8b1222f64263e04a1c92c1bc7abf6d2c8e11e5325811288cf"); // 18800
+        consensus.defaultAssumeValid = uint256S("0x00000000063721e5ee07a09fe6fd73e76b4201728260dad77b5a8c4b8828c786"); // 35000
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -207,12 +207,11 @@ class CMainParams : public CChainParams {
             (  11500, uint256S("0x000000000074a6869637495962c1a37e0a2c20bb00bf1384227a0dc715b0813c"))
             (  12350, uint256S("0x0000000000882760711b236c7ccdbf033b57e0b27b3dea10eb6fe4556cf63d31"))
             (  13400, uint256S("0x0000000001195f13e59033f4ee78521254bef3e3bf6a053a5662edba39c26632"))
-            (  18800, uint256S("0x0000000000680ef8b1222f64263e04a1c92c1bc7abf6d2c8e11e5325811288cf")),
+            (  18800, uint256S("0x0000000000680ef8b1222f64263e04a1c92c1bc7abf6d2c8e11e5325811288cf"))
+            (  35000, uint256S("0x00000000063721e5ee07a09fe6fd73e76b4201728260dad77b5a8c4b8828c786")),
 
-
-
-            1518722559, // * UNIX timestamp of last checkpoint block
-            23404,    // * total number of transactions between genesis and last checkpoint
+            1520257736, // * UNIX timestamp of last checkpoint block
+            41400,    // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
             2200        // * estimated number of transactions per day after checkpoint
         };

src/clientversion.h

@@ -16,8 +16,8 @@
 //! These need to be macros, as clientversion.cpp's and dinero*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 7
+#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/qt/res/css/default.css

@@ -40,24 +40,24 @@ color:#333;
 }
 
 QToolBar {
-background-color:#39497C;
+background-color:#3A3A3C;
 border:0px solid #000;
 padding:0;
 margin:0;
 }
 
 QToolBar > QToolButton {
-background-color:#39497C;
-border:0px solid #333;
+background-color:#3A3A3C;
+border:0px solid #3A3A3C;
 min-height:2.5em;
 padding: 0em 1em;
 font-weight:bold;
 color:#fff;
 }
 
 QToolBar > QToolButton:checked {
-background-color:#fff;
-color:#333;
+background-color:#3198A7;
+color:#3198A7;
 font-weight:bold;
 }
 
@@ -68,12 +68,12 @@ background-color:#F8F6F6;
 /*******************************************************/
 
 QLabel { /* Base Text Size & Color */
-font-size:12px;
-color:#333333;
+font-size:14px;
+color:#3A3A3C;
 }
 
 .QCheckBox { /* Checkbox Labels */
-color:#333333;
+color:#3A3A3C;
 background-color:transparent;
 }
 
@@ -82,7 +82,7 @@ background-color:transparent;
 }
 
 .QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */
-border: 1px solid #82C3E6;
+border: 1px solid #939598;
 font-size:11px;
 min-height:25px;
 outline:0;
@@ -101,7 +101,7 @@ background-color:#f2f2f2;
 /*******************************************************/
 
 QPushButton { /* Global Button Style */
-background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #6C7FB9, stop: .1 #39497C, stop: .95 #39497C, stop: 1 #2F334E);
+background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #939598, stop: .1 #939598, stop: .95 #939598, stop: 1 #939598);
 border:0;
 border-radius:3px;
 color:#ffffff;
@@ -114,7 +114,7 @@ padding-bottom:5px;
 }
 
 QPushButton:hover {
-background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #6C7FB9, stop: .1 #46AADE, stop: .95 #46AADE, stop: 1 #2F334E);
+background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #3197A7, stop: .1 #3197A7, stop: .95 #3197A7, stop: 1 #3197A7);
 }
 
 QPushButton:focus {
@@ -127,7 +127,7 @@ border:1px solid #333;
 }
 
 QComboBox { /* Dropdown Menus */
-border:1px solid #82C3E6;
+border:1px solid #939598;
 padding: 3px 5px 3px 5px;
 background:#fcfcfc;
 min-height:25px;
@@ -139,7 +139,7 @@ background:#f2f2f2;
 }
 
 QComboBox:editable {
-background: #39497C;
+background: #939598;
 color:#616161;
 border:0px solid transparent;
 }
@@ -183,7 +183,7 @@ selection-color:transparent;
 }
 
 QAbstractSpinBox {
-border:1px solid #82C3E6;
+border:1px solid #939598;
 padding: 3px 5px 3px 5px;
 background:#fcfcfc;
 min-height:25px;
@@ -196,8 +196,8 @@ subcontrol-position: top right;
 width:21px;
 background:#fcfcfc;
 border-left:0px;
-border-right:1px solid #82C3E6;
-border-top:1px solid #82C3E6;
+border-right:1px solid #939598;
+border-top:1px solid #939598;
 border-bottom:0px;
 padding-right:1px;
 padding-left:5px;
@@ -215,8 +215,8 @@ width:21px;
 background:#fcfcfc;
 border-top:0px;
 border-left:0px;
-border-right:1px solid #82C3E6;
-border-bottom:1px solid #82C3E6;
+border-right:1px solid #939598;
+border-bottom:1px solid #939598;
 padding-right:1px;
 padding-left:5px;
 padding-bottom:2px;
@@ -275,7 +275,7 @@ background-color:transparent;
 
 QHeaderView::section { /* Table Header Sections */
 qproperty-alignment:center;
-background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #4c97bf, stop: 1 #6C7FB9);
+background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #939598, stop: 1 #939598);
 color:#fff;
 min-height:25px;
 font-weight:bold;
@@ -500,7 +500,7 @@ padding-right:10px;
 }
 
 QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */
-border:1px solid #82C3E6;
+border:1px solid #939598;
 background-color:#fff;
 }
 
@@ -696,7 +696,7 @@ min-width:180px;
 }
 
 QDialog#RPCConsole QWidget#tab_peers  QLabel#peerHeading { /* Peers Info Header */
-color:#39497C;
+color:#939598;
 }
 
 QDialog#RPCConsole QPushButton#openDebugLogfileButton {
@@ -742,15 +742,18 @@ border:0;
 
 /* About Dinero Dialog */
 QDialog#AboutDialog {
-background-color:#F8F6F6;
+background-color:#242a96;
+color:#fff;
 }
 
 QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dinero Contents */
 margin-left:10px;
+color:#fff;
 }
 
 QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dinero text */
 margin-right:10px;
+color:#fff;
 }
 
 /* Edit Address Dialog */
@@ -806,7 +809,7 @@ margin-left:16px;
 QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */
 qproperty-alignment: 'AlignVCenter | AlignRight';
 min-width:160px;
-background-color:#6C7FB9;
+background-color:#939598;
 color:#ffffff;
 margin-right:5px;
 padding-right:5px;
@@ -819,7 +822,7 @@ QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */
 qproperty-alignment: 'AlignVCenter | AlignLeft';
 font-size:12px;
 font-weight:bold;
-color:#6C7FB9;
+color:#939598;
 margin-left:0px;
 }
 
@@ -909,7 +912,7 @@ min-width: 421px;
 QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */
 qproperty-alignment: 'AlignVCenter | AlignRight';
 min-width:160px;
-background-color:#6C7FB9;
+background-color:#939598;
 color:#fff;
 margin-right:5px;
 padding-right:5px;
@@ -965,7 +968,7 @@ color:#818181;
 }
 
 QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk {
-background-color: #39497C;
+background-color: #939598;
 width:1px;
 }
 
@@ -1109,7 +1112,7 @@ background-repeat:none;
 
 QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */
 min-width:180px;
-color:#39497C;
+color:#939598;
 margin-left:67px;
 margin-top:83px;
 margin-right:5px;
@@ -1181,7 +1184,7 @@ min-height:25px;
 }
 
 QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */
-color:#39497C;
+color:#939598;
 font-weight:bold;
 font-size:14px;
 }
@@ -1287,7 +1290,7 @@ min-height:27px;
 QDialog#SendCoinsDialog QLabel#labelBalance {
 margin-left:0px;
 padding-left:0px;
-color:#333333;
+color:#3A3A3C;
 /* font-weight:bold;
 border-radius:5px;
 padding-top:20px;
@@ -1302,7 +1305,7 @@ padding-left:10px;
 /* SEND COINS ENTRY */
 
 QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */
-background-color:#6C7FB9;
+background-color:#939598;
 min-width:102px;
 font-weight:bold;
 font-size:11px;
@@ -1489,7 +1492,7 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin
 /* RECEIVE COINS */
 
 QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */
-background-color:#6C7FB9;
+background-color:#939598;
 min-width:102px;
 color:#ffffff;
 font-weight:bold;
@@ -1507,7 +1510,7 @@ padding-right:5px;
 }
 
 QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */
-background-color:#6C7FB9;
+background-color:#939598;
 min-width:102px;
 color:#ffffff;
 font-weight:bold;
@@ -1567,7 +1570,7 @@ border:1px solid #9e9e9e;
 }
 
 QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */
-color:#39497C;
+color:#939598;
 font-weight:bold;
 font-size:14px;
 }
@@ -1611,12 +1614,12 @@ margin-right:1px;
 }
 
 QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name */
-color:#333333;
+color:#3A3A3C;
 font-weight:bold;
 }
 
 QLabel#transactionSum { /* Example of setObjectName for widgets without name */
-color:#333333;
+color:#3A3A3C;
 }
 
 /* TRANSACTION DETAIL DIALOG */