merge dev; tests broken, need to use wallet for block rewards

2018-05-29 19:04:47 -03:00
parent 69c67b5117 05ee667701
commit 81389fc7b4
74 changed files with 557 additions and 340 deletions
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -533,15 +533,14 @@ public:
        nEquihashN = N;
        nEquihashK = K;
        
-        
        genesis = CreateGenesisBlock(
            1296688602,
            uint256S("0x0000000000000000000000000000000000000000000000000000000000000009"),
            ParseHex("01936b7db1eb4ac39f151b8704642d0a8bda13ec547d54cd5e43ba142fc6d8877cab07b3"),
-            0x200f0f0f, 4, 0);

+
+            KOMODO_MINDIFF_NBITS, 4, 0);
        consensus.hashGenesisBlock = genesis.GetHash();
-
        assert(consensus.hashGenesisBlock == uint256S("0x029f11d80ef9765602235e1bc9727e3eb6ba20839319f761fee920d63401e327"));
        assert(genesis.hashMerkleRoot == uint256S("0xc4eaa58879081de3c24a7b117ed2b28300e7ec4c4c1dff1d3f1268b7857a4ddb"));