DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix reference and test signature

Browse Source
This commit is contained in:
miketout
2018-10-13 00:45:41 -07:00
parent 56ac817fb8
commit 3abeed2c60
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/StakeGuard.cpp
View File

@@ -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 // 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) bool MakeCheatEvidence(CMutableTransaction &mtx, const CTransaction &ccTx, uint32_t voutNum, const CTransaction &cheatTx)
{ {
CCcontract_info *cp,C;
std::vector<unsigned char> vch; std::vector<unsigned char> vch;
CDataStream s = CDataStream(SER_DISK, CLIENT_VERSION); CDataStream s = CDataStream(SER_DISK, CLIENT_VERSION);
bool isCheater = false; bool isCheater = false;

2
src/cheatcatcher.cpp
View File

@@ -83,7 +83,7 @@ bool CCheatList::IsCheatInList(const CTransaction &tx, CTransaction *cheatTx)
{ {
if (p.prevHash != s.prevHash && s.blkHeight >= p.blkHeight) if (p.prevHash != s.prevHash && s.blkHeight >= p.blkHeight)
{ {
cheatTx = &cTx; *cheatTx = cTx;
return true; return true;
} }
} }

13
src/wallet/wallet.cpp
View File

@@ -1451,7 +1451,7 @@ int32_t CWallet::VerusStakeTransaction(CBlock *pBlock, CMutableTransaction &txNe
} }
// TODO REMOVE THIS TOO // 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; cheat.nLockTime = 0;
CTransaction cheatConst(cheat); CTransaction cheatConst(cheat);
SignatureData cheatSig; SignatureData cheatSig;
@@ -3056,14 +3056,11 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
// Don't rebroadcast if newer than nTime: // Don't rebroadcast if newer than nTime:
if (wtx.nTimeReceived > nTime) if (wtx.nTimeReceived > nTime)
continue; 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());
LogPrintf("skip Relaying wtx %s nLockTime %u vs now.%u\n", wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now); continue;
vwtxh.push_back(wtx.GetHash());
continue;
}
} }
mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx));
} }