backport: merge bitcoin#20130, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) #5072

kwvg · 2022-11-03T17:28:16Z

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have added or updated relevant unit/integration/functional/e2e tests
I have made corresponding changes to the documentation

For repository code-owners and collaborators only

I have assigned this pull request to a milestone

github-actions · 2022-11-22T17:35:36Z

This pull request has conflicts, please rebase.

PastaPastaPasta · 2022-12-09T17:16:36Z

@UdjinM6 can you look at the single test failure here and try to provide support?

UdjinM6 · 2023-01-02T18:19:57Z

UdjinM6@4171852 should fix symbol fcntl64 from unsupported version GLIBC_2.28

github-actions · 2023-01-20T05:44:26Z

This pull request has conflicts, please rebase.

UdjinM6

19077 should be marked partial probably + see a question below

src/wallet/wallet.cpp

UdjinM6

utACK

PastaPastaPasta

re-utACK for merging via merge commit

Diff looks correct

UdjinM6 · 2023-02-04T17:57:19Z

Not sure I like the latest push... how about smth like

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4d9a7dc89e..d0d2f6a50d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -40,9 +40,6 @@
 #include <wallet/coincontrol.h>
 #include <wallet/coinselection.h>
 #include <wallet/fees.h>
-#ifdef USE_SQLITE
-#include <wallet/sqlite.h>
-#endif
 #include <walletinitinterface.h>
 #include <warnings.h>
 
@@ -4636,12 +4633,10 @@ bool CWallet::AutoBackupWallet(const fs::path& wallet_path, bilingual_str& error
         strWalletName = "wallet.dat";
     }
 
-#ifdef USE_SQLITE
-    if (IsSQLiteFile(SQLiteDataFile(wallet_path))) {
-        WalletLogPrintf("Automatic wallet backups are not supported with SQLite!\n");
+    if (!IsBDBFile(BDBDataFile(wallet_path))) {
+        WalletLogPrintf("Can't backup a non-BDB file!\n");
         return false;
     }
-#endif
 
     if (nWalletBackups <= 0) {
         WalletLogPrintf("Automatic wallet backups are disabled!\n");

?

kwvg · 2023-02-04T18:32:23Z

Changes made in latest push

UdjinM6

👍

utACK

PastaPastaPasta

utACK for merging via merge commit

…nd use it for new descriptor wallets

…letions

## Issue being fixed or feature implemented fixing a few trivial issues we missed while reviewing #5072 ## What was done? see code ## How Has This Been Tested? tests are ✅ locally ## Breaking Changes n/a ## Checklist:  - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [x] I have assigned this pull request to a milestone

kwvg marked this pull request as draft November 3, 2022 17:28

github-actions bot added the needs rebase label Nov 22, 2022

kwvg force-pushed the sqlite branch from 22accbd to 4c53275 Compare December 5, 2022 18:26

github-actions bot removed the needs rebase label Dec 5, 2022

kwvg mentioned this pull request Jan 2, 2023

backport: merge bitcoin#19525, #20434, #22244, #20476, #19667, #22320, #18676, #19375, #21991, #20421, partial #23511 (auxiliary backports: part 8) #5120

Merged

5 tasks

kwvg force-pushed the sqlite branch 2 times, most recently from caf192e to e5cf20b Compare January 15, 2023 15:40

kwvg changed the title ~~backport: merge bitcoin#20130, #19919, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite)~~ backport: merge bitcoin#20130, #19919, #19077, #20156, #20216, #20308, #20324, #20202, #20275 (sqlite) Jan 15, 2023

kwvg force-pushed the sqlite branch from e5cf20b to 212671c Compare January 20, 2023 05:37

github-actions bot added the needs rebase label Jan 20, 2023

kwvg force-pushed the sqlite branch from 212671c to d08c77d Compare January 20, 2023 07:19

github-actions bot removed the needs rebase label Jan 20, 2023

kwvg force-pushed the sqlite branch 5 times, most recently from 922805e to a22e6ed Compare January 21, 2023 11:44

kwvg force-pushed the sqlite branch 2 times, most recently from 0b8e6e4 to 5a621fd Compare February 1, 2023 18:17

kwvg changed the title ~~backport: merge bitcoin#20130, #19919, #19077, #20156, #20216, #20308, #20324, #20202, #20275 (sqlite)~~ backport: merge bitcoin#20130, #19919, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) Feb 1, 2023

kwvg marked this pull request as ready for review February 1, 2023 19:04

kwvg requested review from PastaPastaPasta and UdjinM6 February 1, 2023 19:05

UdjinM6 reviewed Feb 2, 2023

View reviewed changes

src/wallet/wallet.cpp Outdated Show resolved Hide resolved

UdjinM6 previously approved these changes Feb 2, 2023

View reviewed changes

kwvg requested review from PastaPastaPasta and UdjinM6 February 3, 2023 19:28

PastaPastaPasta previously approved these changes Feb 4, 2023

View reviewed changes

kwvg dismissed PastaPastaPasta’s stale review via 50c5831 February 4, 2023 18:30

kwvg force-pushed the sqlite branch 2 times, most recently from 50c5831 to c4e83ff Compare February 4, 2023 18:31

kwvg requested a review from PastaPastaPasta February 4, 2023 18:32

UdjinM6 approved these changes Feb 4, 2023

View reviewed changes

PastaPastaPasta approved these changes Feb 7, 2023

View reviewed changes

kwvg and others added 14 commits February 7, 2023 10:53

merge bitcoin#20130: remove db mode string

0fa0991

partial bitcoin#19077: Add sqlite as an alternative wallet database a…

f42288c

…nd use it for new descriptor wallets

build: Avoid fcntl64@GLIBC_2.28 in libsqlite3.a

90c7f16

merge bitcoin#20156: Make sqlite support optional (compile-time)

4c7112b

merge bitcoin#20202: Make BDB support optional

a55cb7a

merge bitcoin#20216: fix buffer over-read in SQLite file magic check

1bec382

merge bitcoin#20308: Set bilingual error completely

7758b42

merge bitcoin#20324: Set DatabaseStatus::SUCCESS in MakeSQLiteDatabase

9c4f84e

merge bitcoin#20275: List all wallets in non-SQLite and non-BDB builds

6900545

merge bitcoin#21634: Skip SQLite fsyncs while testing

9795605

merge bitcoin#21540: refactor: dedup sqlite statement preparations/de…

b2d22d9

…letions

merge bitcoin#21962: dedup sqlite PRAGMA access

f3407ce

merge bitcoin#25378: sqlite 3380500 in depends

dc7ad45

merge bitcoin#23112: enable SQLite extended result codes

ca962a6

PastaPastaPasta force-pushed the sqlite branch from c4e83ff to ca962a6 Compare February 7, 2023 16:53

PastaPastaPasta merged commit 3f80203 into dashpay:develop Feb 7, 2023

UdjinM6 mentioned this pull request Feb 11, 2023

fix: 5072 follow-ups #5197

Merged

5 tasks

UdjinM6 added this to the 19 milestone Feb 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

backport: merge bitcoin#20130, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) #5072

backport: merge bitcoin#20130, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) #5072

Uh oh!

kwvg commented Nov 3, 2022

Uh oh!

github-actions bot commented Nov 22, 2022

Uh oh!

PastaPastaPasta commented Dec 9, 2022

Uh oh!

UdjinM6 commented Jan 2, 2023

Uh oh!

github-actions bot commented Jan 20, 2023

Uh oh!

UdjinM6 left a comment

Uh oh!

Uh oh!

UdjinM6 left a comment

Uh oh!

PastaPastaPasta left a comment

Uh oh!

UdjinM6 commented Feb 4, 2023

Uh oh!

kwvg commented Feb 4, 2023

Uh oh!

UdjinM6 left a comment

Uh oh!

PastaPastaPasta left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

backport: merge bitcoin#20130, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) #5072

backport: merge bitcoin#20130, #19077, #20156, #20216, #20308, #20324, #20202, #20275, #21634, #21540, #21962, #25378, #23112 (sqlite) #5072

Uh oh!

Conversation

kwvg commented Nov 3, 2022

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

Uh oh!

github-actions bot commented Nov 22, 2022

Uh oh!

PastaPastaPasta commented Dec 9, 2022

Uh oh!

UdjinM6 commented Jan 2, 2023

Uh oh!

github-actions bot commented Jan 20, 2023

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented Feb 4, 2023

Uh oh!

kwvg commented Feb 4, 2023

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants