Merge branch 'testmaster' into beta

2018-04-16 03:29:05 +03:00
parent 80d1414870 6107175727
commit a5f848c45a
10 changed files with 23 additions and 34 deletions
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -116,6 +116,7 @@ bool CheckEquihashSolution(const CBlockHeader *pblock, const CChainParams& param
    return true;
 }

+uint32_t komodo_chainactive_timestamp();
 int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
 int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],int32_t height,uint8_t pubkey33[33],uint32_t timestamp);
 int32_t komodo_currentheight();