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

Updated miner messages

Browse Source
This commit is contained in:
miketout
2018-05-05 07:52:02 -07:00
parent 05b14c0599
commit ef70c5b2de
3 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/wallet.cpp
View File

@@ -1470,7 +1470,7 @@ bool CWallet::IsMine(const CTransaction& tx)
// special case handling for CLTV scripts, this does not error check to ensure the script is CLTV and is
// only internal to the wallet for that reason.
isminetype CWallet::IsCLTVMine(CScript &script, CScriptID &scriptID, int64_t locktime) const
isminetype CWallet::IsCLTVMine(CScript &script, CScriptID &scriptID) const
{
uint8_t pushOp = script.data()[0];
uint32_t scriptStart = pushOp + 3;
@@ -1527,10 +1527,9 @@ isminetype CWallet::IsMine(const CTransaction& tx, uint32_t voutNum)
if (this->GetCScript(scriptID, subscript))
{
// if this is a CLTV, handle it differently
int64_t lockTime;
if (subscript.IsCheckLockTimeVerify(&lockTime))
if (subscript.IsCheckLockTimeVerify())
{
return this->IsCLTVMine(subscript, scriptID, lockTime);
return this->IsCLTVMine(subscript, scriptID);
}
else
{
@@ -1552,13 +1551,12 @@ isminetype CWallet::IsMine(const CTransaction& tx, uint32_t voutNum)
{
if (opretData.size() > 0 && opretData.data()[0] == OPRETTYPE_TIMELOCK)
{
int64_t unlocktime;
CScript opretScript = CScriptExt(opretData.begin() + 1, opretData.end());
if (CScriptID(opretScript) == scriptID &&
opretScript.IsCheckLockTimeVerify(&unlocktime))
opretScript.IsCheckLockTimeVerify())
{
return this->IsCLTVMine(opretScript, scriptID, unlocktime);
return this->IsCLTVMine(opretScript, scriptID);
}
}
}