LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

adjusted isminefilter

Browse source
This commit is contained in:
Brannon King 2020-03-19 15:39:56 -06:00 • committed by Anthony Fieroni
parent e06ee32336
commit 1faf8bc42a
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/chain.cpp
View file

@ -246,7 +246,7 @@ public:
if (try_lock && result && !*result) return {};
// std::move necessary on some compilers due to conversion from
// LockImpl to Lock pointer
return std::unique_ptr<Chain::Lock>{std::move(result)};
return std::move(result);
}
bool findBlock(const uint256& hash, CBlock* block, int64_t* time, int64_t* time_max) override
{

24
src/wallet/wallet.cpp
View file

@ -1524,12 +1524,16 @@ isminetype CWallet::IsMine(const CTxIn &txin) const
}
static bool excludeStake(isminefilter ismine, isminefilter filter)
static bool matchFilterConsideringStake(isminefilter ismine, isminefilter filter)
{
assert((ismine & ISMINE_STAKE) != ISMINE_STAKE);
assert((filter & ISMINE_STAKE) != ISMINE_STAKE);
return (ismine & filter) && (!(filter & ISMINE_STAKE)
|| ((ismine & ISMINE_STAKE) == (filter & ISMINE_STAKE)));
// the rules:
// 1. if filter does not have stake do simple &
// 2. if filter & claim ^ filter & support then require that one stake bit
// 3. if filter & claim & support then allow either
auto stakeFilter = filter & ISMINE_STAKE;
if (stakeFilter)
return ismine & stakeFilter;
return ismine & filter;
}
// Note that this function doesn't distinguish between a 0-valued input,
@ -1543,7 +1547,7 @@ CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const
{
const CWalletTx& prev = (*mi).second;
if (txin.prevout.n < prev.tx->vout.size())
if (excludeStake(IsMine(prev.tx->vout[txin.prevout.n]), filter))
if (matchFilterConsideringStake(IsMine(prev.tx->vout[txin.prevout.n]), filter))
return prev.tx->vout[txin.prevout.n].nValue;
}
}
@ -1559,7 +1563,7 @@ CAmount CWallet::GetCredit(const CTxOut& txout, const isminefilter& filter) cons
{
if (!MoneyRange(txout.nValue))
throw std::runtime_error(std::string(__func__) + ": value out of range");
return excludeStake(IsMine(txout), filter) ? txout.nValue : 0;
return matchFilterConsideringStake(IsMine(txout), filter) ? txout.nValue : 0;
}
bool CWallet::IsChange(const CTxOut& txout) const
@ -1637,7 +1641,7 @@ bool CWallet::IsAllFromMe(const CTransaction& tx, const isminefilter& filter) co
if (txin.prevout.n >= prev.tx->vout.size())
return false; // invalid input!
if (!(IsMine(prev.tx->vout[txin.prevout.n]) & filter))
if (!matchFilterConsideringStake(IsMine(prev.tx->vout[txin.prevout.n]), filter))
return false;
}
return true;
@ -1999,7 +2003,7 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,
if (pwallet->IsChange(txout))
continue;
}
else if (!(fIsMine & filter))
else if (!matchFilterConsideringStake(fIsMine, filter))
continue;
// In either case, we need to get the destination address
@ -2018,7 +2022,7 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,
listSent.push_back(output);
// If we are receiving the output, add it as a "received" entry
if (fIsMine & filter)
if (matchFilterConsideringStake(fIsMine, filter))
listReceived.push_back(output);
}

2
test/functional/rpc_getblockstats.py
View file

@ -23,7 +23,7 @@ class GetblockstatsTest(BitcoinTestFramework):
def add_options(self, parser):
parser.add_argument('--gen-test-data', dest='gen_test_data',
default=True, action='store_true',
default=False, action='store_true',
help='Generate test data')
parser.add_argument('--test-data', dest='test_data',
default='data/rpc_getblockstats.json',