CCoinsViewCache doesn’t actually support cursor iteration returning the current contents of the cache, so raise an error when the cursor method is called instead of returning a cursor that iterates over stale data.
Also update the gettxoutsetinfo RPC which was relying on the old behavior to be explicit about which view it is returning data about.
CCoinsViewCache doesn't actually support cursor iteration returning the
current contents of the cache, so raise an error when the cursor method is
called instead of returning a cursor that iterates over stale data.
Also update the gettxoutsetinfo RPC which was relying on the old behavior to be
explicit about which view it is returning data about.
211@@ -212,6 +212,9 @@ class CCoinsViewCache : public CCoinsViewBacked
212 uint256 GetBestBlock() const;
213 void SetBestBlock(const uint256 &hashBlock);
214 bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
215+ CCoinsViewCursor* Cursor() const override {
216+ throw std::logic_error("CCCoinsViewCache cursor iteration not supported.");
211@@ -212,6 +212,9 @@ class CCoinsViewCache : public CCoinsViewBacked
212 uint256 GetBestBlock() const;
213 void SetBestBlock(const uint256 &hashBlock);
214 bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
215+ CCoinsViewCursor* Cursor() const override {
This ‘override’ is causing tons of warnings here (for every file that includes coins.h).
0/home/orion/projects/bitcoin/bitcoin/src/coins.h:210:10: warning: 'GetCoin' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
1 bool GetCoin(const COutPoint &outpoint, Coin &coin) const;
Some compilers (clang5, in this case) demand that a whole class is annotated with it if it is used anywhere. So I’d argue against adding it here, or in a separate commit add it to all appropriate CCoinsViewCache methods.
gettxoutsetinfo fields that depend on this iteration display the same with and without this patch) apart from nit.
482@@ -482,6 +483,9 @@ bool ResetBlockFailureFlags(CBlockIndex *pindex);
483 /** The currently-connected chain of blocks (protected by cs_main). */
484 extern CChain chainActive;
485
486+/** Global variable that points to the coins database (protected by cs_main) */
487+extern CCoinsViewDB *pcoinsdbview;
Coins View DB vs coins db view?
Are you suggesting to rename the variable? If so I would slightly prefer not to, because this is a preexisting variable which this PR is just making public.
215+ uint256 GetBestBlock() const override;
216 void SetBestBlock(const uint256 &hashBlock);
217 bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
218+ CCoinsViewCursor* Cursor() const override {
219+ throw std::logic_error("CCoinsViewCache cursor iteration not supported.");
220+ }
Thanks! Though I’m still getting one warning after this:
0In file included from /home/.../bitcoin/src/rpc/rawtransaction.cpp:8:
1/home/.../bitcoin/src/coins.h:214:10: warning: 'BatchWrite' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2 bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock);
3 ^
4/home/.../bitcoin/src/coins.h:186:10: note: overridden virtual function is here
5 bool BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) override;