Merge pull request #1520 from blackjok3rtt/beta

sorry messed it up this works, have tested it.

src/komodo_notary.h

@@ -65,7 +65,6 @@ const char *Notaries_genesis[][2] =
 
 int32_t getkmdseason(int32_t height)
 {
-    int8_t season = 0;
     if ( height <= KMD_SEASON_HEIGHTS[0] )
         return(1);
     for (int32_t i = 1; i < NUM_KMD_SEASONS; i++)
@@ -76,9 +75,8 @@ int32_t getkmdseason(int32_t height)
     return(0);
 };
 
-int32_t getacseason(int32_t timestamp)
+int32_t getacseason(uint32_t timestamp)
 {
-    int8_t season = 0;
     if ( timestamp <= KMD_SEASON_TIMESTAMPS[0] )
         return(1);
     for (int32_t i = 1; i < NUM_KMD_SEASONS; i++)

src/wallet/walletdb.cpp

@@ -489,7 +489,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             // ac_public chains set at height like KMD and ZEX, will force a rescan if we dont ignore this error: bad-txns-acpublic-chain
             // there cannot be any ztx in the wallet on ac_public chains that started from block 1, so this wont affect those. 
             // PIRATE fails this check for notary nodes, need exception. Triggers full rescan without it. 
-            if ( !(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid()) && (state.GetRejectReason() != "bad-txns-acpublic-chain" || state.GetRejectReason() != "bad-txns-acprivacy-chain") )
+            if ( !(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid()) && (state.GetRejectReason() != "bad-txns-acpublic-chain" && state.GetRejectReason() != "bad-txns-acprivacy-chain") )
             {
                 //fprintf(stderr, "tx failed: %s rejectreason.%s\n", wtx.GetHash().GetHex().c_str(), state.GetRejectReason().c_str());
                 // vin-empty on staking chains is error relating to a failed staking tx, that for some unknown reason did not fully erase. save them here to erase and re-add later on.