diff --git a/src/cc/StakeGuard.cpp b/src/cc/StakeGuard.cpp index f7442f9de..ceb2ed1a6 100644 --- a/src/cc/StakeGuard.cpp +++ b/src/cc/StakeGuard.cpp @@ -286,7 +286,7 @@ bool ValidateMatchingStake(const CTransaction &ccTx, uint32_t voutNum, const CTr // this attaches an opret to a mutable transaction that provides the necessary evidence of a signed, cheating stake transaction bool MakeCheatEvidence(CMutableTransaction &mtx, const CTransaction &ccTx, uint32_t voutNum, const CTransaction &cheatTx) { - CCcontract_info *cp,C; + std::vector vch; CDataStream s = CDataStream(SER_DISK, CLIENT_VERSION); bool isCheater = false; diff --git a/src/cheatcatcher.cpp b/src/cheatcatcher.cpp index 5eeecf72f..85252f7d3 100644 --- a/src/cheatcatcher.cpp +++ b/src/cheatcatcher.cpp @@ -83,7 +83,7 @@ bool CCheatList::IsCheatInList(const CTransaction &tx, CTransaction *cheatTx) { if (p.prevHash != s.prevHash && s.blkHeight >= p.blkHeight) { - cheatTx = &cTx; + *cheatTx = cTx; return true; } } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 20685a768..e343648f6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1451,7 +1451,7 @@ int32_t CWallet::VerusStakeTransaction(CBlock *pBlock, CMutableTransaction &txNe } // TODO REMOVE THIS TOO - cheat.vout[0].nValue = stakeSource.vout[voutNum].nValue - txfee; + nValue = cheat.vout[0].nValue = stakeSource.vout[voutNum].nValue - txfee; cheat.nLockTime = 0; CTransaction cheatConst(cheat); SignatureData cheatSig; @@ -3056,14 +3056,11 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) // Don't rebroadcast if newer than nTime: if (wtx.nTimeReceived > nTime) continue; - if ( ASSETCHAINS_SYMBOL[0] == 0 ) + if ( (wtx.nLockTime >= LOCKTIME_THRESHOLD && wtx.nLockTime < now-KOMODO_MAXMEMPOOLTIME) || wtx.hashBlock.IsNull() ) { - if ( wtx.nLockTime >= LOCKTIME_THRESHOLD && wtx.nLockTime < now-KOMODO_MAXMEMPOOLTIME ) - { - LogPrintf("skip Relaying wtx %s nLockTime %u vs now.%u\n", wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now); - vwtxh.push_back(wtx.GetHash()); - continue; - } + LogPrintf("skip Relaying wtx %s nLockTime %u vs now.%u\n", wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now); + vwtxh.push_back(wtx.GetHash()); + continue; } mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); }