Tom Trevethan
8e8dabba5d
Merge 69ba5727d5 into merged_master (Bitcoin PR bitcoin/bitcoin#27180 )
2025-04-09 18:58:26 +00:00
Byron Hambly
d7c9767c01
Merge 710cab1d43 into merged_master (Bitcoin PR bitcoin/bitcoin#26032 )
...
Moved the implementations of DummySignTx and DummySignInput from
spend.cpp to wallet.cpp, to more closely match upstream
2025-04-09 12:04:43 +02:00
Tom Trevethan
e86b323459
Merge 63893d5eab into merged_master (Bitcoin PR bitcoin/bitcoin#26595 )
2025-04-08 12:53:15 +00:00
Tom Trevethan
03de06468f
Merge 80f4979322 into merged_master (Bitcoin PR bitcoin/bitcoin#26347 )
2025-04-08 12:12:39 +00:00
Byron Hambly
9fdd02a17b
Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889 )
2025-04-07 08:11:43 +02:00
Byron Hambly
fa04c471ff
Merge 2c1fe27bf3 into merged_master (Bitcoin PR bitcoin/bitcoin#27080 )
2025-04-05 17:09:56 +02:00
Byron Hambly
58ed702325
Merge fdd363ebd9 into merged_master (Bitcoin PR bitcoin/bitcoin#26910 )
2025-04-05 11:13:37 +02:00
Tom Trevethan
304269bcc3
Merge b1329b7523 into merged_master (Bitcoin PR bitcoin/bitcoin#26499 )
2025-04-04 15:17:09 +00:00
Tom Trevethan
1435fb334b
Merge 79e007d1d6 into merged_master (Bitcoin PR bitcoin/bitcoin#25296 )
2025-04-04 13:36:08 +00:00
Byron Hambly
0bb52bcc79
Merge f1b5d6be57 into merged_master (Bitcoin PR bitcoin/bitcoin#26955 )
2025-04-04 10:35:44 +02:00
Byron Hambly
f6fb703bc1
Merge a62231bca6 into merged_master (Bitcoin PR bitcoin/bitcoin#26690 )
2025-04-04 09:43:16 +02:00
Byron Hambly
7539f63bef
Merge fbe5e1220a into merged_master (Bitcoin PR bitcoin/bitcoin#26675 )
2025-04-01 21:57:01 +02:00
Byron Hambly
feb8f8cf2b
Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758 )
2025-04-01 21:20:49 +02:00
Byron Hambly
16bc3a2027
Merge 4586ae2da1 into merged_master (Bitcoin PR bitcoin/bitcoin#26679 )
2025-04-01 20:16:57 +02:00
Byron Hambly
620e49c665
Merge b4fb0a3255 into merged_master (Bitcoin PR bitcoin/bitcoin#26761 )
2025-04-01 19:31:13 +02:00
Tom Trevethan
f890d5eb98
Merge 360e047a71 into merged_master (Bitcoin PR bitcoin/bitcoin#26747 )
2025-04-01 15:06:14 +00:00
Tom Trevethan
147febdae3
Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752 )
2025-04-01 13:25:03 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Tom Trevethan
3f43afa4b9
Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298 )
2025-03-25 12:09:21 +00:00
Tom Trevethan
bf45fb4395
Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238 )
2025-03-18 11:09:37 +00:00
Tom Trevethan
edf22a74f8
Merge 2ce3d26757 into merged_master (Bitcoin PR bitcoin/bitcoin#26462 )
2025-03-13 18:02:44 +00:00
Byron Hambly
073316ddaf
Merge e334f7a545 into merged_master (Bitcoin PR bitcoin/bitcoin#26594 )
2025-03-04 11:18:49 +02:00
Byron Hambly
07aebbf505
lint: fixes
2025-02-14 15:54:27 +02:00
Byron Hambly
ae2a8a49d6
Merge e9a914465d into merged_master (Elements PR #1385 )
2025-02-11 14:35:51 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8dabb73663
moneyrange: check asset type
2025-01-17 13:09:10 +02:00
Byron Hambly
a6f8dc6a86
tidy: fixes for clang tidy ci job
2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
fb832dd2ca
Merge 9f650062fc into merged_master (Bitcoin PR bitcoin/bitcoin#26005 )
2024-11-27 11:36:17 +02:00
Byron Hambly
09e2cad10f
Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499 )
2024-11-27 10:47:04 +02:00
Byron Hambly
21d8cd57f3
Merge 96f1b2d34f into merged_master (Bitcoin PR bitcoin/bitcoin#26091 )
2024-11-26 20:18:09 +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
2d4094eb0b
Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768 )
2024-11-26 12:31:26 +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
8497f3e1ab
Merge 80da4be57b into merged_master (Bitcoin PR bitcoin/bitcoin#25896 )
2024-11-22 09:52:06 +02:00
Byron Hambly
c76ddcea4d
Merge 6b56873b41 into merged_master (Bitcoin PR bitcoin/bitcoin#25784 )
2024-11-04 11:52:14 +02:00
Byron Hambly
70420df6e9
Merge 0f0508bc72 into merged_master (Bitcoin PR bitcoin/bitcoin#25869 )
2024-11-04 11:43:33 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
f9e2640d86
Merge 0425ce577f into merged_master (Bitcoin PR bitcoin/bitcoin#25679 )
...
fundrawtransaction.py can be a bit flaky, added a FIXME
2024-11-04 11:11:25 +02:00
Byron Hambly
ef90df8f7e
Merge 0ae0aa251b into merged_master (Bitcoin PR bitcoin/bitcoin#24678 )
2024-11-03 14:56:05 +02:00
Byron Hambly
ee6cc528c6
Merge 64f7a1940d into merged_master (Bitcoin PR bitcoin/bitcoin#25734 )
2024-11-03 14:28:09 +02:00
Byron Hambly
d6e6f35037
Merge c336f813b3 into merged_master (Bitcoin PR bitcoin/bitcoin#25504 )
2024-11-02 17:28:21 +02:00
Byron Hambly
a33b20f0ff
Merge a6fc293c0a into merged_master (Bitcoin PR bitcoin/bitcoin#25656 )
...
ReserveDestination::SetBlindingPubKey was removed since it was only used
in one place (in Wallet::GetNewChangeDestination), and after this change
it was silently breaking blinded change addresses by somehow replacing
the destination with CNoDestination...
2024-11-01 12:36:42 +02:00
Byron Hambly
31269c3653
Merge a478c5350a into merged_master (Bitcoin PR bitcoin/bitcoin#25790 )
2024-10-29 14:34:49 +02:00
Byron Hambly
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699 )
2024-10-29 14:19:22 +02:00
Byron Hambly
49d368ea6b
Merge 006740b6f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25721 )
2024-10-25 13:33:19 +02:00
Byron Hambly
cefc4804f5
Merge de3c46c938 into merged_master (Bitcoin PR bitcoin/bitcoin#25272 )
2024-10-24 16:53:05 +02:00
Byron Hambly
2081703f71
Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494 )
2024-10-17 17:06:13 +02:00
Byron Hambly
e1add57650
Merge 1b285b7807 into merged_master (Bitcoin PR bitcoin/bitcoin#25590 )
2024-10-17 14:15:20 +02:00
Byron Hambly
b81762fcb2
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997 )
2024-10-17 10:15:38 +02:00
