Merge pull request #4 from absolute-community/dev

30-05-2018 release

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 12)
 define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Absolute Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/absolute-community/absolutecoin/issues],[absolutecore])

contrib/seeds/nodes_main.txt

@@ -1,9 +1,14 @@
+139.99.42.106:18888
+139.99.98.145:18888
+51.255.174.238:18888
+54.37.14.240:18888
+164.132.195.79:18888
+208.167.248.187:18888
+45.77.146.105:18888
+45.77.221.206:18888
+45.76.171.105:18888
 54.37.17.154:18888
-151.80.142.66:18888
-91.134.137.168:18888
-91.134.139.112:18888
-91.134.139.255:18888
-54.36.162.70:18888
 54.36.162.69:18888
-54.36.162.71:18888
-54.36.162.72:18888
+151.80.142.66:18888
+54.36.162.72:18888
+91.134.137.168:18888

contrib/seeds/nodes_test.txt

@@ -1,9 +1,2 @@
-54.37.17.154:17777
-151.80.142.66:17777
-91.134.137.168:17777
-91.134.139.112:17777
-91.134.139.255:17777
-54.36.162.70:17777
-54.36.162.69:17777
-54.36.162.71:17777
-54.36.162.72:17777
+139.99.98.238:17777
+139.99.98.239:17777

src/chainparams.cpp

@@ -78,20 +78,27 @@ class CMainParams : public CChainParams {
 public:
     CMainParams() {
         strNetworkID = "main";
-        consensus.nSubsidyHalvingInterval = 350400; // limit subsidy on the yearly basis
+        consensus.nSubsidyHalvingInterval = 350400; // Note: actual number of blocks per calendar year
+		/* masternodes */
         consensus.nMasternodePaymentsStartBlock = 500;
         consensus.nMasternodePaymentsIncreaseBlock = 6720; // start increasing after first week
         consensus.nMasternodePaymentsIncreasePeriod = 6720; // weekly increase
-        consensus.nInstantSendKeepLock = 24;
-        consensus.nBudgetPaymentsStartBlock = 350000; 
-        consensus.nBudgetPaymentsCycleBlocks = 28800; // ~(60*24*30)/1.5
-        consensus.nBudgetPaymentsWindowBlocks = 100;
-        consensus.nBudgetProposalEstablishingTime = 60*60*24;
-        consensus.nSuperblockStartBlock = 99999999; // currently not used
-        consensus.nSuperblockCycle = 28800; // ~(60*24*30)/1.5
-        consensus.nGovernanceMinQuorum = 10;
-        consensus.nGovernanceFilterElements = 20000;
         consensus.nMasternodeMinimumConfirmations = 15;
+
+		consensus.nInstantSendKeepLock = 24;
+
+		/* budget */		
+		consensus.nBudgetPaymentsStartBlock = 98800; 
+        consensus.nBudgetPaymentsCycleBlocks = 7300; // ~(60*24*30)/1.5 / 4
+        consensus.nBudgetPaymentsWindowBlocks = 100;
+        consensus.nBudgetProposalEstablishingTime = 60*60*24; // in seconds 
+
+        consensus.nSuperblockStartBlock = 98800; 
+        consensus.nSuperblockCycle = 7300; // ~(60*24*30)/1.5 / 4
+
+		/* Governance */ 
+		consensus.nGovernanceMinQuorum = 10;
+        consensus.nGovernanceFilterElements = 20000;        
         consensus.nMajorityEnforceBlockUpgrade = 750;
         consensus.nMajorityRejectBlockOutdated = 950;
         consensus.nMajorityWindow = 1000;
@@ -148,9 +155,9 @@ class CMainParams : public CChainParams {
         assert(consensus.hashGenesisBlock == uint256S("0x00000de52875a68d7bf6a5bb5ad1b89fd7df4d67a9603669327949923dc74d7e"));
         assert(genesis.hashMerkleRoot == uint256S("0x12844a9cbf517654e272975506ab56af4d5c8dde0332a0ee48ba159c72daae03"));
 
-        vSeeds.push_back(CDNSSeedData("seed1.absolutecoin.net", "seed1.absolutecoin.net"));
-        vSeeds.push_back(CDNSSeedData("seed2.absolutecoin.net", "seed2.absolutecoin.net"));
-        vSeeds.push_back(CDNSSeedData("seed3.absolutecoin.net", "seed3.absolutecoin.net"));
+        vSeeds.push_back(CDNSSeedData("absolutecoin.net", "seed1.absolutecoin.net"));
+        vSeeds.push_back(CDNSSeedData("absolutecoin.net", "seed2.absolutecoin.net"));
+        vSeeds.push_back(CDNSSeedData("absolutecoin.net", "seed3.absolutecoin.net"));
 
         // Absolute addresses start with 'A'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,23);
@@ -202,12 +209,12 @@ class CTestNetParams : public CChainParams {
         consensus.nMasternodePaymentsIncreaseBlock = 40320; // increase after 6 weeks first
         consensus.nMasternodePaymentsIncreasePeriod = 26880; // increase every 4 weeks afterwards
         consensus.nInstantSendKeepLock = 6;
-        consensus.nBudgetPaymentsStartBlock = 3000000000;
-        consensus.nBudgetPaymentsCycleBlocks = 28800;
+        consensus.nBudgetPaymentsStartBlock =450;
+        consensus.nBudgetPaymentsCycleBlocks = 150;
         consensus.nBudgetPaymentsWindowBlocks = 100;
         consensus.nBudgetProposalEstablishingTime = 60*20;
-        consensus.nSuperblockStartBlock = 3000000000;
-        consensus.nSuperblockCycle = 28800; // Superblocks can be issued hourly on testnet
+        consensus.nSuperblockStartBlock = 450;
+        consensus.nSuperblockCycle = 150; // Superblocks can be issued hourly on testnet
         consensus.nGovernanceMinQuorum = 1;
         consensus.nGovernanceFilterElements = 500;
         consensus.nMasternodeMinimumConfirmations = 1;
@@ -257,19 +264,24 @@ class CTestNetParams : public CChainParams {
         nMaxTipAge = 0x7fffffff; // allow mining on top of old blocks for testnet
         nDelayGetHeadersTime = 24 * 60 * 60 * 14;
         nPruneAfterHeight = 1000;
-
+/* old
         genesis = CreateGenesisBlock(1518597800, 519328, 0x1e0ffff0, 1, 30 * COIN);
-
-
-        consensus.hashGenesisBlock = genesis.GetHash();
         assert(consensus.hashGenesisBlock == uint256S("0x0000e585b5b736b3a33ae8999fa2d63e036fb42e56ea5b6e5eacf3b473dd4e6"));
         assert(genesis.hashMerkleRoot == uint256S("0x12844a9cbf517654e272975506ab56af4d5c8dde0332a0ee48ba159c72daae03"));
-
+*/
+        genesis = CreateGenesisBlock(1518598800, 1399438, 0x1e0ffff0, 1, 30 * COIN);
+        consensus.hashGenesisBlock = genesis.GetHash();
+
+        assert(consensus.hashGenesisBlock == uint256S("0x00000de52875a68d7bf6a5bb5ad1b89fd7df4d67a9603669327949923dc74d7e"));
+        assert(genesis.hashMerkleRoot == uint256S("0x12844a9cbf517654e272975506ab56af4d5c8dde0332a0ee48ba159c72daae03"));
+
         vFixedSeeds.clear();
         vSeeds.clear();
-        vSeeds.push_back(CDNSSeedData("tseed1.absolutecoin.net", "tseed1.absolutecoin.net"));
-        vSeeds.push_back(CDNSSeedData("tseed2.absolutecoin.net", "tseed2.absolutecoin.net"));
-        vSeeds.push_back(CDNSSeedData("tseed3.absolutecoin.net", "tseed3.absolutecoin.net"));
+
+		vSeeds.push_back(CDNSSeedData("absolutecoin.net", "tseed1.absolutecoin.net"));
+        vSeeds.push_back(CDNSSeedData("absolutecoin.net", "tseed2.absolutecoin.net"));
+        vSeeds.push_back(CDNSSeedData("absolutecoin.net", "tseed3.absolutecoin.net"));
+
 
         // Testnet Absolute addresses start with 'y'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,140);
@@ -287,10 +299,10 @@ class CTestNetParams : public CChainParams {
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
 
-        fMiningRequiresPeers = true;
+        fMiningRequiresPeers = false;
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
-        fMineBlocksOnDemand = false;
+        fMineBlocksOnDemand = true;
         fTestnetToBeDeprecatedFieldRPC = true;
 
         nPoolMaxTransactions = 3;

src/chainparamsseeds.h

@@ -8,26 +8,24 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x63,0x2a,0x6a}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x63,0x62,0x91}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xff,0xae,0xee}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x25,0x0e,0xf0}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa4,0x84,0xc3,0x4f}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0xa7,0xf8,0xbb}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4d,0x92,0x69}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4d,0xdd,0xce}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xab,0x69}, 18888},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x25,0x11,0x9a}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0x50,0x8e,0x42}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x89,0xa8}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x8b,0x70}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x8b,0xff}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x46}, 18888},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x45}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x47}, 18888},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x48}, 18888}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0x50,0x8e,0x42}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x48}, 18888},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x89,0xa8}, 18888}
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x25,0x11,0x9a}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0x50,0x8e,0x42}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x89,0xa8}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x8b,0x70}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x86,0x8b,0xff}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x46}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x45}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x47}, 17777},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x24,0xa2,0x48}, 17777}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x63,0x62,0xee}, 17777},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x63,0x62,0xef}, 17777}
 };
 #endif // ABSOLUTE_CHAINPARAMSSEEDS_H

src/qt/locale/absolute_fr.ts

@@ -1623,7 +1623,7 @@ https://www.transifex.com/projects/p/absolutecoin/</translation>
     </message>
     <message>
         <source>Balances</source>
-        <translation>soldes</translation>
+        <translation>Soldes</translation>
     </message>
     <message>
         <source>Unconfirmed transactions to watch-only addresses</source>
@@ -1735,7 +1735,7 @@ https://www.transifex.com/projects/p/absolutecoin/</translation>
     </message>
     <message>
         <source>out of sync</source>
-        <translation>désynchronisé</translation>
+        <translation>Désynchronisé</translation>
     </message>
     <message>
         <source>Automatic backups are disabled, no mixing available!</source>

src/qt/res/css/base.css

@@ -47,9 +47,10 @@ padding:0;
 margin:0;
 }
 
-QToolBar > QToolButton {
+QToolBar > QToolButton { /* tab */ 
 background-color:#fff;
-border:0px solid #333;
+border:0px solid #7C7A7A;
+border-right:1px solid #333;
 min-height:2.5em;
 min-width: 8em;
 padding: 0em 1em;
@@ -58,7 +59,7 @@ color:#333;
 }
 
 QToolBar > QToolButton:checked {
-background-color:#06adaa;
+background-color:#7F92FF;
 color:#fff;
 font-weight:bold;
 }
@@ -84,7 +85,7 @@ background-color:transparent;
 }
 
 .QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */
-border: 1px solid #06adaa;
+border: 1px solid #7F92FF;
 font-size:11px;
 min-height:25px;
 outline:0;
@@ -103,21 +104,22 @@ background-color:#f2f2f2;
 /*******************************************************/
 
 QPushButton { /* Global Button Style */
-background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #026663, stop: .1 #06adaa, stop: .95 #06adaa, stop: 1 #06adaa);
+background-color:#7F92FF;
 border:0;
+border-bottom:2px solid #7F92FF;
 border-radius:3px;
 color:#ffffff;
 font-size:12px;
 font-weight:normal;
 height: 26px;
-padding-left:25px;
+padding-left:20px;
 padding-right:25px;
 padding-top:5px;
 padding-bottom:5px;
 }
 
 QPushButton:hover {
-background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #026663, stop: .1 #026663, stop: .95 #026663, stop: 1 #06adaa);
+    border-bottom:2px solid #424D8A;
 }
 
 QPushButton:focus {
@@ -126,11 +128,11 @@ outline:none;
 }
 
 QPushButton:pressed {
-border:1px solid #333;
+    border-bottom:2px solid #424D8A;
 }
 
 QComboBox { /* Dropdown Menus */
-border:1px solid #06adaa;
+border:1px solid #7F92FF;
 padding: 3px 5px 3px 5px;
 background:#fcfcfc;
 min-height:25px;
@@ -142,8 +144,8 @@ background:#f2f2f2;
 }
 
 QComboBox:editable {
-background: #06adaa;
-color:#616161;
+background: #424D8A;
+color:#eee;
 border:0px solid transparent;
 }
 
@@ -186,7 +188,7 @@ selection-color:transparent;
 }
 
 QAbstractSpinBox {
-border:1px solid #06adaa;
+border:1px solid #7F92FF;
 padding: 3px 5px 3px 5px;
 background:#fcfcfc;
 min-height:25px;
@@ -199,8 +201,8 @@ subcontrol-position: top right;
 width:21px;
 background:#fcfcfc;
 border-left:0px;
-border-right:1px solid #06adaa;
-border-top:1px solid #06adaa;
+border-right:1px solid #7F92FF;
+border-top:1px solid #7F92FF;
 border-bottom:0px;
 padding-right:1px;
 padding-left:5px;
@@ -218,8 +220,8 @@ width:21px;
 background:#fcfcfc;
 border-top:0px;
 border-left:0px;
-border-right:1px solid #06adaa;
-border-bottom:1px solid #06adaa;
+border-right:1px solid #7F92FF;
+border-bottom:1px solid #7F92FF;
 padding-right:1px;
 padding-left:5px;
 padding-bottom:2px;
@@ -278,7 +280,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 #026663, stop: 1 #06adaa);
+background-color:#424D8A;
 color:#fff;
 min-height:25px;
 font-weight:bold;
@@ -503,7 +505,7 @@ padding-right:10px;
 }
 
 QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */
-border:1px solid #06adaa;
+border:1px solid #7F92FF;
 background-color:#fff;
 }
 
@@ -809,7 +811,7 @@ margin-left:16px;
 QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */
 qproperty-alignment: 'AlignVCenter | AlignRight';
 min-width:160px;
-background-color:#06adaa;
+background-color:#424D8A;
 color:#ffffff;
 margin-right:5px;
 padding-right:5px;
@@ -821,7 +823,7 @@ min-height:35px;
 QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */
 qproperty-alignment: 'AlignVCenter | AlignLeft';
 font-size:16px;
-color:#06adaa;
+color:#7F92FF;
 margin-left:0px;
     font-weight: bold;
 }
@@ -913,7 +915,7 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend
 qproperty-alignment: 'AlignVCenter | AlignCenter';
 max-width: 421px;
 min-width: 421px;
-background-color:#06adaa;
+background-color:#424D8A;
 color:#fff;
 margin-right: 5px;
 padding-right: 5px;
@@ -1116,7 +1118,7 @@ background-repeat:none;
 
 QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */
 min-width:180px;
-color:#06adaa;
+color:#7F92FF;
 margin-left:67px;
 margin-top:83px;
 margin-right:5px;
@@ -1140,7 +1142,7 @@ font-weight:normal;
 font-size:12px;
 max-width:369px;
 margin-top:12px;
-margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */
+margin-left:-70px; /* CSS Voodoo - set to -66px to hide default transaction icons */
 padding-right: 24px;
 }