Commit graph

424 commits

Author SHA1 Message Date
ivanlele
04affef8b8 Merge c16e909b3e into merged_master (Bitcoin PR bitcoin/bitcoin#28574) 2026-03-30 16:42:26 +00:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937) 2026-03-30 10:51:11 +00:00
ivanlele
a51624f2ed
Merge d4cc0c6845 into merged_master (Bitcoin PR bitcoin/bitcoin#30750) 2026-03-24 11:43:55 +00:00
Tom Trevethan
af51da82d8 Merge e682e7db7e into merged_master (Bitcoin PR bitcoin-core/gui#824) 2026-03-12 23:16:30 +00:00
ikripaka
055b97a616
Merge d9aa7b23e4 into merged_master (Bitcoin PR bitcoin/bitcoin#26596) 2026-03-05 18:34:53 +00:00
Tom Trevethan
848288ba1c Merge 5acdc2b97d into merged_master (Bitcoin PR bitcoin/bitcoin#26606) 2026-02-22 23:33:14 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494) 2026-02-19 16:14:46 +00:00
Byron Hambly
451ac2cc1c
Merge 45b2a91897 into merged_master (Bitcoin PR bitcoin/bitcoin#29404) 2025-12-04 09:29:58 +02:00
Byron Hambly
1bc20d7011
Merge b1a46b212f into merged_master (Bitcoin PR bitcoin/bitcoin#26008) 2025-12-04 09:07:39 +02:00
Tom Trevethan
14df0ae22f Merge 128b4a8038 into merged_master (Bitcoin PR bitcoin/bitcoin#29403) 2025-12-04 00:28:49 +00:00
Tom Trevethan
c2d8f099b1 Merge 6ff0aa089c into merged_master (Bitcoin PR bitcoin/bitcoin#28987) 2025-12-03 23:34:15 +00:00
Byron Hambly
491e02867c
Merge 717103bcce into merged_master (Bitcoin PR bitcoin/bitcoin#29315) 2025-11-28 16:09:36 +02:00
Byron Hambly
8b5cee9cc0
Merge d84f736ba1 into merged_master (Bitcoin PR bitcoin/bitcoin#29176) 2025-11-17 21:16:55 +02:00
Byron Hambly
63ecc217cc
Merge d5e5810bd3 into merged_master (Bitcoin PR bitcoin/bitcoin#28999) 2025-11-17 13:26:57 +02:00
Byron Hambly
12b5689c12
Merge fe4e83f50d into merged_master (Bitcoin PR bitcoin/bitcoin#28912) 2025-11-11 10:33:43 +02:00
Byron Hambly
26b9abc2f2
Merge b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922) 2025-11-11 08:56:23 +02:00
Byron Hambly
f5d048649c
test: fix wallet_fundrawtransaction.py
left some FIXMEs for when sendall is upgraded to support blinded
addresses
2025-10-28 10:52:40 +02:00
Byron Hambly
3a0c71af6c
walletdb: lock cs_wallet for loadspecificblindingkey 2025-08-22 09:29:12 +02:00
Byron Hambly
4de706a2a4
ci(tidy): use emplace_back instead of push_back 2025-08-22 09:23:55 +02:00
Byron Hambly
6c55760a2d Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244) 2025-07-04 17:24:18 +02:00
Byron Hambly
ea86e8f268 Merge 7edce77ff3 into merged_master (Bitcoin PR bitcoin/bitcoin#28067) 2025-07-03 09:42:33 +02:00
Byron Hambly
bc6f151cb8 Merge f08d914a67 into merged_master (Bitcoin PR bitcoin/bitcoin#27920) 2025-06-30 15:29:17 +02:00
Byron Hambly
489e4b0c3e Merge 7952a5934a into merged_master (Bitcoin PR bitcoin/bitcoin#27927) 2025-06-30 13:48:32 +02:00
Byron Hambly
2663ae44dd Merge d9c7c2fd3e into merged_master (Bitcoin PR bitcoin/bitcoin#24914) 2025-06-30 13:48:12 +02:00
Byron Hambly
edc585d157 Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636) 2025-06-25 11:40:46 +02:00
Byron Hambly
6e6d5d7687 Merge 6cc136bbd3 into merged_master (Bitcoin PR bitcoin/bitcoin#27556) 2025-06-20 21:20:43 +02:00
Byron Hambly
d1fe2b52de Merge b34e19a2bf into merged_master (Bitcoin PR bitcoin/bitcoin#27665) 2025-06-20 15:48:43 +02:00
Byron Hambly
8b9efdd41d Merge d02df7db6b into merged_master (Bitcoin PR bitcoin/bitcoin#26715) 2025-06-20 15:44:24 +02:00
Byron Hambly
db3df5936f Merge 5325a61167 into merged_master (Bitcoin PR bitcoin/bitcoin#27224) 2025-05-14 14:30:41 +02:00
Byron Hambly
0d6796ec53 Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217) 2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Tom Trevethan
1435fb334b Merge 79e007d1d6 into merged_master (Bitcoin PR bitcoin/bitcoin#25296) 2025-04-04 13:36:08 +00:00
Byron Hambly
f6fb703bc1 Merge a62231bca6 into merged_master (Bitcoin PR bitcoin/bitcoin#26690) 2025-04-04 09:43:16 +02:00
Byron Hambly
2a130e22dd Merge 1e6b384d59 into merged_master (Bitcoin PR bitcoin/bitcoin#26702) 2025-03-31 18:19:45 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Tom Trevethan
edf22a74f8 Merge 2ce3d26757 into merged_master (Bitcoin PR bitcoin/bitcoin#26462) 2025-03-13 18:02:44 +00:00
Byron Hambly
58b3c39377 Merge 5690848dfb into merged_master (Bitcoin PR bitcoin/bitcoin#26532) 2025-03-04 10:57:04 +02:00
Byron Hambly
cd60150aa4 Merge c85688347e into merged_master (Bitcoin PR bitcoin/bitcoin#26021) 2024-11-26 15:01:13 +02:00
Byron Hambly
e1e241d410 Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602)
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +02:00
Byron Hambly
1006327a13 Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707) 2024-11-04 11:26:40 +02:00
furszy
57249ff669
wallet: introduce active db txn listeners
Useful to ensure that the in-memory state is updated only
after successfully committing the data to disk.
2024-10-21 08:29:22 -03:00
furszy
055c0532fc
wallet: provide WalletBatch to 'DeleteRecords'
So it can be used within an external db txn context.
2024-10-21 08:29:22 -03:00
Sebastian Falbesoner
1786be7b4a scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h
Follow-up for PR #30856, commit 0dd66251.

-BEGIN VERIFY SCRIPT-
sed -i "s|config/bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l config/bitcoin-config\.h)
sed -i "s|bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l "bitcoin-config\.h" ./src ./test ./cmake)
git mv ./cmake/bitcoin-config.h.in ./cmake/bitcoin-build-config.h.in
-END VERIFY SCRIPT-
2024-10-10 12:22:12 +02:00
James Dorfman
a68592df70 Merge c892cb7d8d into merged_master (Bitcoin PR bitcoin/bitcoin#25383) 2024-10-09 05:29:53 +00:00
James Dorfman
11e59304dc Merge 480d8069d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24924) 2024-09-19 15:58:36 +00:00
MarcoFalke
3333415890
scripted-diff: LogPrint -> LogDebug
-BEGIN VERIFY SCRIPT-
 sed -i 's/\<LogPrint\>/LogDebug/g' $( git grep -l '\<LogPrint\>'  -- ./contrib/ ./src/ ./test/ ':(exclude)src/logging.h' )
-END VERIFY SCRIPT-
2024-08-29 13:49:57 +02:00
Ava Chow
d56a450bf5 gui: Use wallet name for wallet migration rather than WalletModel
To prepare for migrating wallets that are not loaded, when migration
occurs in the GUI, it should not rely on a WalletModel existing.

Co-authored-by: furszy <matiasfurszyfer@protonmail.com>
2024-08-13 11:25:38 -04:00
James Dorfman
31df518140 Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108) 2024-08-13 04:20:55 +00:00
James Dorfman
b3a377c2d0 Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661) 2024-07-08 15:17:32 +00:00
Ava Chow
771bc60f13 wallet: Use LegacyDataSPKM when loading
In SetupLegacyScriptPubKeyMan, a base LegacyDataSPKM will be created if
the database has the format "bdb_ro" (i.e. the wallet was opened only
for migration purposes).

All of the loading functions are now called with a LegacyDataSPKM object
instead of LegacyScriptPubKeyMan.
2024-07-01 14:25:55 -04:00