Prepared for launch

216k155 · Oct 9, 2017 · 2643c89 · 2643c89
1 parent 7af5fe9
commit 2643c89
Show file tree

Hide file tree

Showing 5 changed files with 223 additions and 72 deletions.
diff --git a/lux-qt b/lux-qt
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -427,7 +427,7 @@ vector<COutput> CActiveMasternode::SelectCoinsMasternode()
     // Filter
     BOOST_FOREACH(const COutput& out, vCoins)
     {
-        if(out.tx->vout[out.i].nValue == 16120*COIN) { //exactly 161.200 LUX
+        if(out.tx->vout[out.i].nValue == 16120*COIN) { //exactly 161.20 LUX
         	filteredCoins.push_back(out);
         }
     }

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -75,15 +75,15 @@ class CMainParams : public CChainParams {
         genesis.nVersion = 1;
         genesis.nTime    = 1507458571; // epochtime 08/10/2017
         genesis.nBits    = 0x1e0fffff; // Generated nBits. Input right nBits to prevent nBits below minimum works error 
-        genesis.nNonce   = 1681290; // Input nNonce 0
+        genesis.nNonce   = 0; // Input nNonce 0
 
         // Generate genesis hash should take a while as exploit protection active in main.cpp
         // Anti exploitation activated. Note: need to wait until the generation finished for the right genesis block generated. Otherwise none of them are valid
 
         hashGenesisBlock = genesis.GetHash();
 
-        assert(hashGenesisBlock == uint256("0x000006dd8c2aeaeb0430d65bff23b2f9f736e8ac0390b9d94d6a0a3b2fd0bd85")); 
-        assert(genesis.hashMerkleRoot == uint256("0xc1d10e1bc7a27d910dfa24c2f470d9da92ba1696c1a677ce9f3166c1e1ac29e5"));
+        //assert(hashGenesisBlock == uint256("0x")); 
+        //assert(genesis.hashMerkleRoot == uint256("0x"));
 
 
         vSeeds.push_back(CDNSSeedData("sd1", "45.32.245.217"));

diff --git a/src/main.cpp b/src/main.cpp
@@ -1107,9 +1107,9 @@ int64_t GetProofOfWorkReward(int64_t nFees, int nHeight)
 {
     int64_t nSubsidy = 1 * COIN;
 
-    if(pindexBest->nHeight <= 1)
+    if(pindexBest->nHeight == 1)
     {
-        nSubsidy = 300000 * COIN;                     // Initilised static pre-mine. 
+        nSubsidy = 3000000 * COIN;                     // Initilised static pre-mine. 
     }
         else if(pindexBest->nHeight < 500)             // First halving - Activated instamine protection 
     {
@@ -1119,7 +1119,7 @@ int64_t GetProofOfWorkReward(int64_t nFees, int nHeight)
     {
         nSubsidy = 10 * COIN;  // ~10m
     }
-        else if(pindexBest->nHeight < 1001000)         // Third halving - Superblock wards | Happy Birthday Lux 1 Year | 10/10/2018 | 30 LUX/block reward 
+        else if(pindexBest->nHeight < 1001000)         // Third halving - Superblock rewards | Happy Birthday Lux 1 Year | 10/10/2018 | 30 LUX/block reward 
     {
         nSubsidy = 30 * COIN;  // ~30,000 reward to miner
     }