merge-script cd6e4c9235 Merge bitcoin/bitcoin#34215: wallettool: fix unnamed createfromdump failure walletsdir deletion ...

f78f6f1dc8 wallettool: do not use fs::remove_all in createfromdump cleanup (Ava Chow)

Pull request description:

  As pointed out in https://github.com/bitcoin/bitcoin/pull/34156#issuecomment-3716728670, it is possible for `createfromdump` to also accidentally delete the entire wallets directory if the wallet name is the empty string and the dumpfile contains a checksum error.

  This is also fixed by removing the files created by only removing the directory for named wallets, and avoiding the use of `fs::remove_all`.

ACKs for top commit:
  waketraindev:
    lgtm ACK f78f6f1dc8
  polespinasa:
    code review and tACK f78f6f1dc8
  rkrux:
    Code review and tACK f78f6f1dc8
  willcl-ark:
    ACK f78f6f1dc8
  pablomartin4btc:
    ACK f78f6f1dc8

Tree-SHA512: ff1e7668131ec3632c67d990c99e8fddff28605e7e553c7e20695e61017c88476c3636e22f2007e763a00d527e80e4d1d3d45409f6678d28729b8397430bfe7a

2026-01-07 14:32:01 +00:00

..

rpc

Merge bitcoin/bitcoin#34135: rpc: [wallet] Use unsigned type for tx version in sendall

2026-01-06 15:58:25 -08:00

test

Merge bitcoin/bitcoin#33135: wallet: warn against accidental unsafe older() import

2026-01-02 16:15:50 -08:00

CMakeLists.txt

…

coincontrol.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

coincontrol.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

coinselection.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

coinselection.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

context.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

context.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

crypter.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

crypter.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

db.cpp

Fix windows libc++ fs::path fstream compile errors

2025-10-06 11:25:56 -04:00

db.h

…

dump.cpp

wallettool: do not use fs::remove_all in createfromdump cleanup

2026-01-06 16:11:41 -08:00

dump.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

external_signer_scriptpubkeyman.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

external_signer_scriptpubkeyman.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

feebumper.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

feebumper.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

fees.cpp

…

fees.h

…

init.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

interfaces.cpp

scripted-diff: refactor: wallet: Delete IsCrypted

2025-12-24 11:09:15 -08:00

load.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

load.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

migrate.cpp

Merge bitcoin/bitcoin#33192: refactor: unify container presence checks

2025-12-17 16:17:29 -05:00

migrate.h

…

receive.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

receive.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

scriptpubkeyman.cpp

refactor: unify container presence checks - trivial counts

2025-12-03 13:36:58 +01:00

scriptpubkeyman.h

Merge bitcoin/bitcoin#29675: wallet: Be able to receive and spend inputs involving MuSig2 aggregate keys

2025-10-14 16:25:52 -04:00

spend.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

spend.h

fees: refactor: rename fees to block_policy_estimator

2025-10-27 10:41:02 +01:00

sqlite.cpp

log: Use LogWarning for non-critical logs

2025-11-27 14:33:59 +01:00

sqlite.h

…

transaction.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

transaction.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

types.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

wallet.cpp

Merge bitcoin/bitcoin#34156: wallet: fix unnamed legacy wallet migration failure

2026-01-07 11:08:57 +00:00

wallet.h

scripted-diff: refactor: wallet: Delete IsCrypted

2025-12-24 11:09:15 -08:00

walletdb.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

walletdb.h

wallet, log: reduce unconditional logging during load

2025-09-29 13:59:44 -04:00

wallettool.cpp

scripted-diff: refactor: wallet: Delete IsCrypted

2025-12-24 11:09:15 -08:00

wallettool.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

walletutil.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

walletutil.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00