This repository was archived by the owner on Oct 31, 2018. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11TEMPLATE = app
22TARGET = BitBlocks-qt
3- VERSION = 3.0.1
3+ VERSION = 3.1.2.2
44INCLUDEPATH += src src/json src/qt
55DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
66CONFIG += no_include_pwd
Original file line number Diff line number Diff line change 77
88// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
99#define CLIENT_VERSION_MAJOR 3
10- #define CLIENT_VERSION_MINOR 0
11- #define CLIENT_VERSION_REVISION 1
12- #define CLIENT_VERSION_BUILD 0
10+ #define CLIENT_VERSION_MINOR 1
11+ #define CLIENT_VERSION_REVISION 2
12+ #define CLIENT_VERSION_BUILD 2
1313
1414// Converts the parameter X to a string after macro replacement on X has been performed.
1515// Don't merge these into one macro!
Original file line number Diff line number Diff line change @@ -2707,29 +2707,13 @@ bool LoadBlockIndex(bool fAllowNew)
27072707 block.nBits = bnProofOfWorkLimit.GetCompact ();
27082708 block.nNonce = !fTestNet ? 381089 : 381089 ;
27092709
2710- if (true && (block.GetHash () != hashGenesisBlock)) {
2711-
2712- // This will figure out a valid hash and Nonce if you're
2713- // creating a different genesis block:
2714- uint256 hashTarget = CBigNum ().SetCompact (block.nBits ).getuint256 ();
2715- while (block.GetHash () > hashTarget)
2716- {
2717- ++block.nNonce ;
2718- if (block.nNonce == 0 )
2719- {
2720- printf (" NONCE WRAPPED, incrementing time" );
2721- ++block.nTime ;
2722- }
2723- }
2724- }
2725-
2726- // // debug print
2727- block.print ();
2728-
2729- printf (" block.GetHash() == %s\n " , block.GetHash ().ToString ().c_str ());
2730- printf (" block.hashMerkleRoot == %s\n " , block.hashMerkleRoot .ToString ().c_str ());
2731- printf (" block.nTime = %u \n " , block.nTime );
2732- printf (" block.nNonce = %u \n " , block.nNonce );
2710+ /*
2711+ genesis.nTime = 1515168297
2712+ genesis.nNonce = 381089
2713+ genesis.nVersion = 1
2714+ genesis.GetHash = 000003c33b3d4bae48eee92de5f429de95438430fae619fb89a53ca5aa5ae8f4
2715+ genesis.hashMerkleRoot = 6e92623290b4393a8ccafc4ef6c9d3c30fc882878942bd677dc053e7d588689d
2716+ */
27332717
27342718 assert (block.hashMerkleRoot == uint256 (" 0x6e92623290b4393a8ccafc4ef6c9d3c30fc882878942bd677dc053e7d588689d" ));
27352719 assert (block.GetHash () == (!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet));
You can’t perform that action at this time.
0 commit comments