upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBitflash <btf01@proton.me>2026-07-31 08:53:31 -0300
committerGitHub <noreply@github.com>2026-07-31 08:53:31 -0300
commit7066648e6a871bd17984e02c04f22c2f22f2d744 (patch)
tree386f7b4a2c525299ba7ad239890e46bf4365f404 /src
parent3bbfb50ef85feeddad936eb1fe8cce232410b8a6 (diff)
wallet: believe the chain about what has already been spent (#62)
fSpent lives in wallet.dat and is written when this node spends something. A wallet.dat restored from backup, or copied and used on another machine, carries whatever that flag was when the copy was taken -- so it can say "unspent" about coins the chain shows as gone. The balance reads high and nothing contradicts it until a send is attempted against coins that do not exist. #47 is about this shape of problem and #40 is someone living through it; Bitcoin fixed the same thing in 53d508072. On startup, after the block index is loaded and before anything reports a balance, walk the wallet and mark spent whatever the transaction index says is spent. One direction only. Marking spent when the chain says spent is safe; clearing the flag because the chain has not caught up would offer up coins already on their way out. fSpent is one flag per transaction rather than per output, which is how 0.1.0 has always worked -- CommitTransactionSpent already marks a whole previous transaction when it spends any part of it -- so this matches rather than changing the model. It reports every run, including the runs where it finds nothing, with a breakdown of why: RescanSpentFlags() : examined 17, already-spent 0, not-indexed 17, corrected 0 A check that speaks only when it finds something is indistinguishable from one that never ran, and that confusion has cost this project real time. The breakdown earned its place immediately: it is how the test below turned from a guess into an answer. Verified running against a wallet with 17 transactions and against an empty one, with no false corrections in either. The correcting branch itself is NOT exercised by a real case: on this chain no test wallet holds a transaction that is both in the transaction index and spent, and the counters show why -- all 17 were absent from the index, so the comparison never had anything to compare.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp65
-rw-r--r--src/main.h2
-rw-r--r--src/main_gui.cpp4
3 files changed, 71 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index dbb2c41..85f89d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -693,6 +693,71 @@ bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs)
693 return true; 693 return true;
694} 694}
695 695
696int RescanSpentFlags()
697{
698 // Believe the chain, not the wallet, about what has already been spent.
699 //
700 // fSpent lives in wallet.dat and is written when this node spends
701 // something. A wallet.dat that was restored from backup, or copied and
702 // used on another machine, carries whatever that flag was at the moment
703 // the copy was taken -- so it can say "unspent" about coins the chain
704 // shows as gone. The balance then reads high, and the error only surfaces
705 // when a send is attempted against coins that no longer exist.
706 //
707 // Issue #47 is about this shape of problem and #40 reports living through
708 // it. Bitcoin fixed the same thing in 53d508072.
709 //
710 // One direction only. Marking spent when the chain says spent is safe;
711 // clearing the flag because the chain has not caught up yet would offer
712 // up coins that are already on their way out.
713 CTxDB txdb("r");
714 int nCorrected = 0;
715 int nExamined = 0;
716 int nAlreadySpent = 0, nNotIndexed = 0;
717 CRITICAL_BLOCK(cs_mapWallet)
718 {
719 foreach(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet)
720 {
721 CWalletTx& wtx = item.second;
722 nExamined++;
723 if (wtx.fSpent)
724 { nAlreadySpent++; continue; }
725
726 CTxIndex txindex;
727 if (!txdb.ReadTxIndex(wtx.GetHash(), txindex))
728 { nNotIndexed++; continue; }
729
730 // fSpent is one flag for the whole transaction, not one per
731 // output -- CommitTransactionSpent already marks the entire
732 // previous transaction when it spends any part of it, so matching
733 // that here keeps the two consistent.
734 bool fSeenSpent = false;
735 for (int i = 0; i < (int)txindex.vSpent.size() && i < (int)wtx.vout.size(); i++)
736 if (!txindex.vSpent[i].IsNull() && wtx.vout[i].IsMine())
737 fSeenSpent = true;
738
739 if (fSeenSpent)
740 {
741 wtx.fSpent = true;
742 wtx.WriteToDisk();
743 nCorrected++;
744 printf("RescanSpentFlags() : %s was spent on chain but the wallet did not know\n",
745 wtx.GetHash().ToString().substr(0,10).c_str());
746 }
747 }
748 }
749 // Always say it ran. A check that reports only when it finds something is
750 // indistinguishable from a check that never executed, and this codebase has
751 // paid for that confusion more than once.
752 printf("RescanSpentFlags() : examined %d, already-spent %d, not-indexed %d, corrected %d\n",
753 nExamined, nAlreadySpent, nNotIndexed, nCorrected);
754 if (nCorrected)
755 printf("RescanSpentFlags() : this wallet was behind the chain about what it had already spent, "
756 "which is what a restored backup looks like\n");
757 return nCorrected;
758}
759
760
696void ReacceptWalletTransactions() 761void ReacceptWalletTransactions()
697{ 762{
698 // Reaccept any txes of ours that aren't already in a block 763 // Reaccept any txes of ours that aren't already in a block
diff --git a/src/main.h b/src/main.h
index eea10b1..2d5cb86 100644
--- a/src/main.h
+++ b/src/main.h
@@ -117,6 +117,8 @@ bool AddKey(const CKey& key);
117vector<unsigned char> GenerateNewKey(); 117vector<unsigned char> GenerateNewKey();
118bool AddToWallet(const CWalletTx& wtxIn); 118bool AddToWallet(const CWalletTx& wtxIn);
119void ReacceptWalletTransactions(); 119void ReacceptWalletTransactions();
120// Returns how many wallet transactions the chain corrected.
121int RescanSpentFlags();
120void RelayWalletTransactions(); 122void RelayWalletTransactions();
121bool LoadBlockIndex(bool fAllowNew=true); 123bool LoadBlockIndex(bool fAllowNew=true);
122void PrintBlockTree(); 124void PrintBlockTree();
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 99bcb6f..c593162 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -243,6 +243,10 @@ int main(int argc, char* argv[])
243 try 243 try
244 { 244 {
245 if (!LoadWallet()) { fprintf(stderr, "LoadWallet failed\n"); return 1; } 245 if (!LoadWallet()) { fprintf(stderr, "LoadWallet failed\n"); return 1; }
246
247 // After the block index, so there is a chain to compare the wallet
248 // against, and before anything reports a balance.
249 RescanSpentFlags();
246 } 250 }
247 catch (const std::exception& e) 251 catch (const std::exception& e)
248 { 252 {