Skip to content

set nNonce to Null in CoinsView #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/coins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ bool CCoinsView::HaveCoin(const COutPoint &outpoint) const
}

CCoinsViewBacked::CCoinsViewBacked(CCoinsView *viewIn) : base(viewIn) { }
bool CCoinsViewBacked::GetCoin(const COutPoint &outpoint, Coin &coin) const { return base->GetCoin(outpoint, coin); }
bool CCoinsViewBacked::GetCoin(const COutPoint &outpoint, Coin &coin) const {
assert(coin.out.nNonce.IsNull());
return base->GetCoin(outpoint, coin);
}
bool CCoinsViewBacked::HaveCoin(const COutPoint &outpoint) const { return base->HaveCoin(outpoint); }
uint256 CCoinsViewBacked::GetBestBlock() const { return base->GetBestBlock(); }
std::vector<uint256> CCoinsViewBacked::GetHeadBlocks() const { return base->GetHeadBlocks(); }
Expand All @@ -51,8 +54,10 @@ static inline CCoinsMapKey native_key(const COutPoint& outpoint) {

CCoinsMap::iterator CCoinsViewCache::FetchCoin(const COutPoint &outpoint) const {
CCoinsMap::iterator it = cacheCoins.find(native_key(outpoint));
if (it != cacheCoins.end())
if (it != cacheCoins.end()) {
assert(it->second.coin.out.nNonce.IsNull());
return it;
}
Coin tmp;
if (!base->GetCoin(outpoint, tmp))
return cacheCoins.end();
Expand All @@ -79,6 +84,7 @@ bool CCoinsViewCache::GetCoin(const COutPoint &outpoint, Coin &coin) const {

void CCoinsViewCache::AddCoin(const COutPoint &outpoint, Coin&& coin, bool possible_overwrite) {
assert(!coin.IsSpent());
coin.out.nNonce = CConfidentialNonce();
if (coin.out.scriptPubKey.IsUnspendable()) return;
CCoinsMap::iterator it;
bool inserted;
Expand Down