D3998.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D3998.diff
View Options

	diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
	--- a/src/wallet/wallet.h
	+++ b/src/wallet/wallet.h
	@@ -1086,8 +1086,6 @@
	const std::map<CKeyID, int64_t> &GetAllReserveKeys() const {
	return m_pool_key_to_index;
	}
	- /** Does the wallet have at least min_keys in the keypool? */
	- bool HasUnusedKeys(size_t min_keys) const;

	std::set<std::set<CTxDestination>> GetAddressGroupings();
	std::map<CTxDestination, Amount> GetAddressBalances();
	diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
	--- a/src/wallet/wallet.cpp
	+++ b/src/wallet/wallet.cpp
	@@ -4005,16 +4005,11 @@
	}
	LearnAllRelatedScripts(keypool.vchPubKey);
	batch.ErasePool(index);
	+ LogPrintf("keypool index %d removed\n", index);
	it = setKeyPool->erase(it);
	}
	}

	-bool CWallet::HasUnusedKeys(size_t min_keys) const {
	- return setExternalKeyPool.size() >= min_keys &&
	- (setInternalKeyPool.size() >= min_keys \|\|
	- !CanSupportFeature(FEATURE_HD_SPLIT));
	-}
	-
	void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script) {
	std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
	CPubKey pubkey;