Byron Hambly
34f8d7a3c4
Merge 53313c49d6 into merged_master (Bitcoin PR bitcoin/bitcoin#28246 )
2025-08-01 12:40:43 +02:00
Byron Hambly
0aec781a49
Merge 459272d639 into merged_master (Bitcoin PR bitcoin/bitcoin#26152 )
2025-08-01 09:39:10 +02:00
Byron Hambly
61ff980881
Merge e25af11225 into merged_master (Bitcoin PR bitcoin/bitcoin#28431 )
2025-07-21 10:18:41 +02:00
Byron Hambly
b456503d27
Merge d2ccca253f into merged_master (Bitcoin PR bitcoin/bitcoin#26567 )
...
Modified to keep using dummy signing until we can update to the
descriptor method introduced in this PR from upstream
2025-07-18 14:38:53 +02:00
Byron Hambly
6a868386b5
Merge 7bf078f2b7 into merged_master (Bitcoin PR bitcoin/bitcoin#28237 )
2025-07-04 21:24:50 +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
653849b243
Merge 8e0cf4f90c into merged_master (Bitcoin PR bitcoin/bitcoin#27846 )
2025-06-28 09:12:19 +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
478129f30a
Merge 0e70a1b625 into merged_master (Bitcoin PR bitcoin/bitcoin#26066 )
2025-05-15 14:34:40 +02:00
Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02:00
Byron Hambly
2c3f2cde3d
Merge 395b932807 into merged_master (Bitcoin PR bitcoin/bitcoin#26720 )
2025-05-08 14:49:47 +02:00
Byron Hambly
0b1508bf01
ci: fix lint issues
2025-04-17 11:06:32 +02:00
Byron Hambly
d5c13168a6
Merge 27dcc07c08 into merged_master (Bitcoin PR bitcoin/bitcoin#26699 )
2025-04-12 15:13:11 +02:00
Byron Hambly
bb3be3f31d
Merge 381593c906 into merged_master (Bitcoin PR bitcoin/bitcoin#24845 )
2025-04-11 22:04:03 +02:00
Byron Hambly
5444a46602
Merge fc7c21f664 into merged_master (Bitcoin PR bitcoin/bitcoin#27271 )
2025-04-11 20:53:03 +02:00
Thomas Trevethan
9ab3f83b5f
Merge 40e1c4d402 into merged_master (Bitcoin PR bitcoin/bitcoin#25666 )
2025-04-11 14:30:24 +01:00
Byron Hambly
38d6b625c3
Merge 609c95d4a8 into merged_master (Bitcoin PR bitcoin/bitcoin#27227 )
2025-04-10 09:28:08 +02:00
Tom Trevethan
bff78b8a4e
Merge 4ea3a8b71d into merged_master (Bitcoin PR bitcoin/bitcoin#25806 )
2025-04-09 17:17:19 +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
Byron Hambly
10a48f98f1
Merge 94070029fb into merged_master (Bitcoin PR bitcoin/bitcoin#27053 )
2025-04-08 11:36:10 +02:00
Byron Hambly
c7bff919f0
Merge fb82d91a9c into merged_master (Bitcoin PR bitcoin/bitcoin#24149 )
2025-04-05 22:44:14 +02:00
Byron Hambly
64bdcdbfb5
Merge 8ae2808a43 into merged_master (Bitcoin PR bitcoin/bitcoin#25659 )
2025-04-03 11:43:10 +02:00
Tom Trevethan
694c51a39f
Merge 3212d104f4 into merged_master (Bitcoin PR bitcoin/bitcoin#23829 )
2025-04-01 15:23:27 +00:00
Byron Hambly
01371bb9e6
Merge 3f8591d46b into merged_master (Bitcoin PR bitcoin/bitcoin#26661 )
2025-04-01 10:04:18 +02:00
Byron Hambly
6be0c1b786
Merge 65d7c31b3f into merged_master (Bitcoin PR bitcoin/bitcoin#25789 )
2025-04-01 06:55:02 +02:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
639d93bd8f
Merge ba47a4ba97 into merged_master (Bitcoin PR bitcoin/bitcoin#26668 )
2025-03-31 09:03:25 +02:00
Tom Trevethan
9f84d01252
Merge 8f3021155e into merged_master (Bitcoin PR bitcoin/bitcoin#26643 )
2025-03-28 14:46:40 +00:00
Tom Trevethan
0dcc75c6ae
Merge ef744c03e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25729 )
2025-03-24 15:11:44 +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
c9a908f006
Merge edbe4f808a into merged_master (Bitcoin PR bitcoin/bitcoin#26611 )
2025-03-17 13:32:40 +00:00
Tom Trevethan
9d59cc40da
Merge f0c4807a6a into merged_master (Bitcoin PR bitcoin/bitcoin#26560 )
2025-03-13 14:07:01 +00:00
Byron Hambly
6b82cfa0aa
Merge df4e99dca3 into merged_master (Elements PR #1423 )
2025-02-28 15:25:43 +02:00
Byron Hambly
d97db2851f
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730 )
2025-02-28 14:25:06 +02:00
Byron Hambly
7c5f4914fb
Merge f37bd15d47 into merged_master (Bitcoin PR bitcoin/bitcoin#25685 )
...
FIXME introduces a new regression test to reproduce the issue commented
out in the confidential transaction functional test
2025-02-27 09:55:45 +02:00
Pablo Greco
59c30c0779
Blinding: update change_position after calling fillBlindDetails
2025-02-25 14:57:10 -08: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
f3ccfc53ba
compile: clean up warnings for unused
2024-12-20 11:46:24 +02:00
Byron Hambly
72cac1605e
doc: clean up some fixme comments
2024-12-20 11:45:04 +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
68e38e5baf
Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872 )
2024-11-25 14:46:13 +02:00
Byron Hambly
f46275d011
Merge 2bd9aa5a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25647 )
...
This was a difficult merge as always with diffs that touch spend.cpp and
createtransactioninternal. Added a FIXME NB for fundrawtransaction with
external outputs, which MUST be fixed before a new release.
2024-11-21 14:29:21 +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
ee6cc528c6
Merge 64f7a1940d into merged_master (Bitcoin PR bitcoin/bitcoin#25734 )
2024-11-03 14:28:09 +02:00
Byron Hambly
dfd7755a16
Merge 5d294bccba into merged_master (Bitcoin PR bitcoin/bitcoin#25825 )
2024-11-01 15:34:32 +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
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699 )
2024-10-29 14:19:22 +02:00
