Skip to content

merge bitcoin#19290...19308: berkeley db refactoring #4714

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

Merged
UdjinM6 merged 13 commits into from
Mar 6, 2022
Merged

merge bitcoin#19290...19308: berkeley db refactoring #4714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
07a4d48
merge bitcoin#18918: Move salvagewallet into wallettool
kwvg Mar 6, 2022
cf0142a
qt: drop salvage wallet from user interface
UdjinM6 Mar 5, 2022
068fc48
merge bitcoin#19290: Move BDB specific things into bdb.{cpp/h}
kwvg Mar 3, 2022
7b9a69b
merge bitcoin#19292: refactor Read, Write, Erase, and Exists into non…
kwvg Jun 15, 2020
a276282
merge bitcoin#19308: BerkeleyBatch Handle cursor internally
kwvg May 15, 2020
6192331
merge bitcoin#19310: BerkeleyDatabase make BerkeleyDatabase::Create, …
kwvg Jun 17, 2020
a40b947
merge bitcoin#19324: Move BerkeleyBatch static functions to BerkeleyD…
kwvg Mar 3, 2022
6248f8d
merge bitcoin#19320: Replace CDataStream& with CDataStream&& where ap…
kwvg Jun 20, 2020
c0c3934
merge bitcoin#19325: Refactor BerkeleyDatabase to introduce DatabaseB…
kwvg Jun 18, 2020
d03a478
merge bitcoin-gui#118: Remove BDB version from the Information tab
kwvg Mar 6, 2022
9879322
qt: restore "wallet path on repair tab" logic
UdjinM6 Mar 5, 2022
044f3ab
merge bitcoin#19334: Introduce WalletDatabase abstract class
kwvg Mar 4, 2022
8276555
merge bitcoin#19102: Introduce and use DummyDatabase instead of dummy…
kwvg Mar 4, 2022
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
4 changes: 4 additions & 0 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,15 @@ BITCOIN_CORE_H = \
versionbits.h \
versionbitsinfo.h \
walletinitinterface.h \
wallet/bdb.h \
wallet/coincontrol.h \
wallet/crypter.h \
wallet/db.h \
wallet/fees.h \
wallet/load.h \
wallet/psbtwallet.h \
wallet/rpcwallet.h \
wallet/salvage.h \
wallet/wallet.h \
wallet/walletdb.h \
wallet/wallettool.h \
Expand Down Expand Up @@ -469,6 +471,7 @@ libdash_wallet_a_SOURCES = \
coinjoin/options.cpp \
coinjoin/util.cpp \
interfaces/wallet.cpp \
wallet/bdb.cpp \
wallet/coincontrol.cpp \
wallet/crypter.cpp \
wallet/db.cpp \
Expand All @@ -477,6 +480,7 @@ libdash_wallet_a_SOURCES = \
wallet/psbtwallet.cpp \
wallet/rpcdump.cpp \
wallet/rpcwallet.cpp \
wallet/salvage.cpp \
wallet/wallet.cpp \
wallet/walletdb.cpp \
wallet/walletutil.cpp \
Expand Down
4 changes: 2 additions & 2 deletions src/bench/coin_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<st
static void CoinSelection(benchmark::Bench& bench)
{
auto chain = interfaces::MakeChain();
const CWallet wallet(*chain, WalletLocation(), WalletDatabase::CreateDummy());
const CWallet wallet(*chain, WalletLocation(), CreateDummyWalletDatabase());
std::vector<std::unique_ptr<CWalletTx>> wtxs;
LOCK(wallet.cs_wallet);

Expand Down Expand Up @@ -60,7 +60,7 @@ static void CoinSelection(benchmark::Bench& bench)

typedef std::set<CInputCoin> CoinSet;
static auto testChain = interfaces::MakeChain();
static const CWallet testWallet(*testChain, WalletLocation(), WalletDatabase::CreateDummy());
static const CWallet testWallet(*testChain, WalletLocation(), CreateDummyWalletDatabase());
std::vector<std::unique_ptr<CWalletTx>> wtxn;

// Copied from src/wallet/test/coinselector_tests.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/bench/wallet_balance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const b
const auto& ADDRESS_WATCHONLY = ADDRESS_B58T_UNSPENDABLE;

std::unique_ptr<interfaces::Chain> chain = interfaces::MakeChain();
CWallet wallet{*chain.get(), WalletLocation(), WalletDatabase::CreateMock()};
CWallet wallet{*chain.get(), WalletLocation(), CreateMockWalletDatabase()};
{
bool first_run;
if (wallet.LoadWallet(first_run) != DBErrors::LOAD_OK) assert(false);
Expand Down
1 change: 1 addition & 0 deletions src/dash-wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ static void SetupWalletToolArgs()
// Hidden
gArgs.AddArg("-h", "", ArgsManager::ALLOW_ANY, OptionsCategory::HIDDEN);
gArgs.AddArg("-help", "", ArgsManager::ALLOW_ANY, OptionsCategory::HIDDEN);
gArgs.AddArg("salvage", "Attempt to recover private keys from a corrupt wallet", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
}

static bool WalletAppInit(int argc, char* argv[])
Expand Down
Loading