Skip to content
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.

Sign up for GitHub

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

wallet: Ensure best block matches wallet scan state #30221

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

wallet: Ensure best block matches wallet scan state #30221

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2490986
wallet: Update best block record after block dis/connect
achow101 Apr 26, 2024
39bfbc1
scripted-diff: Rename LastBlock to BestBlock
achow101 Apr 29, 2024
e17cc1f
wallet: Combine last block processed hash and height into a struct
achow101 Apr 29, 2024
3c951f7
wallet: Replace chainStateFlushed in loading with WriteBestBlock
achow101 Jun 3, 2024
bab0d89
wallet: Remove WriteBestBlock from chainStateFlushed
achow101 Jun 3, 2024
207fd1b
wallet: Sync m_best_block with BESTBLOCK_NOMERKLE
achow101 Jun 3, 2024
64facd5
wallet: Load best block record in LoadWallet
achow101 Jun 3, 2024
1f209f9
wallet: Use best block locator in migrate instead of re-reading it
achow101 Apr 29, 2024
151c733
wallet: use SetBestBlock when saving progress during rescan
achow101 Apr 29, 2024
d4c7013
wallet: Remove chainStateFlushed
achow101 Apr 29, 2024
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
Prev Previous commit
Next Next commit
wallet: Use best block locator in migrate instead of re-reading it 
Instead of calling ReadBestBlock to get the best block locator, use the
m_best_block.m_locator that we already have in CWallet.
  • Loading branch information
@achow101
achow101 committed Nov 19, 2024
commit 1f209f9d5271708893fde290d4b6218e36420874
10 changes: 2 additions & 8 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4135,12 +4135,6 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
}
}

// Get best block locator so that we can copy it to the watchonly and solvables
BestBlock best_block;
if (!local_wallet_batch.ReadBestBlock(best_block)) {
return util::Error{_("Error: Unable to read wallet's best block locator record")};
}

// Check if the transactions in the wallet are still ours. Either they belong here, or they belong in the watchonly wallet.
// We need to go through these in the tx insertion order so that lookups to spends works.
std::vector<uint256> txids_to_delete;
Expand All @@ -4153,7 +4147,7 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
data.watchonly_wallet->nOrderPosNext = nOrderPosNext;
watchonly_batch->WriteOrderPosNext(data.watchonly_wallet->nOrderPosNext);
// Write the best block locator to avoid rescanning on reload
if (!watchonly_batch->WriteBestBlock(best_block)) {
if (!watchonly_batch->WriteBestBlock(m_best_block)) {
return util::Error{_("Error: Unable to write watchonly wallet best block locator record")};
}
}
Expand All @@ -4162,7 +4156,7 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
solvables_batch = std::make_unique<WalletBatch>(data.solvable_wallet->GetDatabase());
if (!solvables_batch->TxnBegin()) return util::Error{strprintf(_("Error: database transaction cannot be executed for wallet %s"), data.solvable_wallet->GetName())};
// Write the best block locator to avoid rescanning on reload
if (!solvables_batch->WriteBestBlock(best_block)) {
if (!solvables_batch->WriteBestBlock(m_best_block)) {
return util::Error{_("Error: Unable to write solvable wallet best block locator record")};
}
}
Expand Down