Byron Hambly
a3fdbcd901
Merge c252a0fc0f into merged_master (Bitcoin PR bitcoin/bitcoin#28892 )
2025-11-11 09:48:12 +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
64d3fabf80
Merge 42b0d5f59b into merged_master (Bitcoin PR bitcoin/bitcoin#28740 )
2025-11-05 15:49:40 +02:00
Byron Hambly
f0aca27969
Merge cb8844e2b9 into merged_master (Bitcoin PR bitcoin/bitcoin#28728 )
2025-11-05 15:10:53 +02:00
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583 )
2025-08-07 10:05:15 +02:00
Byron Hambly
e826a411ec
Merge 48b8910d12 into merged_master (Bitcoin PR bitcoin/bitcoin#28508 )
...
GetHash now manually implemented for CBlockHeader. SER_GETHASH removed,
so CProof now always serializes `solution`. CBlockHeader::GetHash copies
from Serialize, but only includes `challenge` of CProof, and no signblock witness
This needs to be tested with liquidv1 chain
2025-08-05 14:12:48 +02:00
Byron Hambly
34f8d7a3c4
Merge 53313c49d6 into merged_master (Bitcoin PR bitcoin/bitcoin#28246 )
2025-08-01 12:40:43 +02:00
Byron Hambly
ca14c27f1b
Merge 00fc7cdc25 into merged_master (Bitcoin PR bitcoin/bitcoin#28200 )
2025-07-05 07:45:03 +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
4fd04eb7d7
Merge 24d5cf9314 into merged_master (Bitcoin PR bitcoin/bitcoin#27425 )
2025-07-01 13:43:46 +02:00
Byron Hambly
da9f9ededb
Merge 361a0c00b3 into merged_master (Bitcoin PR bitcoin/bitcoin#27783 )
2025-06-27 13:45:18 +02:00
Byron Hambly
bc8e793db9
Merge 05ec664632 into merged_master (Bitcoin PR bitcoin/bitcoin#27666 )
2025-06-25 13:04:30 +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
8b9efdd41d
Merge d02df7db6b into merged_master (Bitcoin PR bitcoin/bitcoin#26715 )
2025-06-20 15:44:24 +02:00
Byron Hambly
b1d470027d
Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125 )
2025-06-20 10:46:05 +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
979170fd2c
ci: asan fixes
2025-04-29 13:49:44 +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
9fdd02a17b
Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889 )
2025-04-07 08:11:43 +02:00
Byron Hambly
2ba842104d
Merge 550e6bd227 into merged_master (Bitcoin PR bitcoin/bitcoin#26935 )
2025-04-05 10:57:32 +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
Tom Trevethan
694c51a39f
Merge 3212d104f4 into merged_master (Bitcoin PR bitcoin/bitcoin#23829 )
2025-04-01 15:23:27 +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
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
Tom Trevethan
bf45fb4395
Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238 )
2025-03-18 11:09:37 +00:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
793d471d13
Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077 )
2024-11-03 16:10:34 +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
09c66ca532
Merge f5e96ecef5 into merged_master (Bitcoin PR bitcoin/bitcoin#25616 )
2024-11-01 13:00:25 +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
f7b03ad72e
Merge 1abbae65eb into merged_master (Bitcoin PR bitcoin/bitcoin#24584 )
...
This should be reviewed carefully. The new availablecoins_test was
showing an intermittent error [1]. The test variants were split out into
their own test cases to work around the issue, but requires further
investigation.
[1]: https://github.com/ElementsProject/elements/issues/1370
2024-10-24 12:08:44 +02:00
Byron Hambly
07a088faf3
Merge 6078f91299 into merged_master (Bitcoin PR bitcoin/bitcoin#25701 )
2024-10-18 14:37:52 +02:00
Byron Hambly
728096bcee
Merge d1e42659bb into merged_master (Bitcoin PR bitcoin/bitcoin#25543 )
2024-10-18 12:17:32 +02:00
Byron Hambly
6742dac5d2
Merge 4aaa3b5200 into merged_master (Bitcoin PR bitcoin/bitcoin#25351 )
2024-10-17 10:12:52 +02:00
James Dorfman
e22bfb3011
Merge 316afb1eca into merged_master (Bitcoin PR bitcoin/bitcoin#25218 )
2024-10-16 04:56:53 +00:00
James Dorfman
f6f9f6b155
Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036 )
2024-10-15 17:03:37 +00:00
James Dorfman
8ebf20fe8e
Merge 8be652e439 into merged_master (Bitcoin PR bitcoin/bitcoin#25005 )
...
These changes affect the wallet. Please double check them, since I'm not
confident that I merged them correctly.
2024-09-15 22:01:42 +00:00
James Dorfman
57830cb012
Merge 3368f84c43 into merged_master (Bitcoin PR bitcoin/bitcoin#25083 )
...
I'm not certain about the elements-specific changes to the `COutput`
constructor in src/wallet/coinselection.cpp. Please double check those.
2024-08-20 03:56:11 +00:00
James Dorfman
16f007177a
Merge 1ab389b1ba into merged_master (Bitcoin PR bitcoin/bitcoin#20640 )
...
This was a tricky merge (wallet refactor). Please double check my
changes to CreateTransactionInternal(...) in src/wallet/spend.cpp, and to
SendGenerationTransaction(...) in src/wallet/rpc/elements.cpp.
Lastly, I got all the tests passing, but I'm not certain that the changes
with fixed_change_pos in CreateTransactionInternal were correct.
2024-08-13 03:26:28 +00:00
James Dorfman
ff2a2e72c9
Merge b7d78e6244 into merged_master (Bitcoin PR bitcoin/bitcoin#24711 )
2024-07-08 07:14:19 +00:00
James Dorfman
77b849f4c6
Merge 20c5630f8c into merged_master (Elements PR #1277 )
2024-05-24 06:39:06 +00:00
James Dorfman
4bad776853
Merge 2a3e8fb359 into merged_master (Bitcoin PR bitcoin/bitcoin#24696 )
2024-05-23 21:52:57 +00:00
James Dorfman
17d45cdb7d
Merge 3740cdd125 into merged_master (Bitcoin PR bitcoin/bitcoin#24091 )
2024-03-19 06:35:30 +00:00
James Dorfman
5082ed04fd
Merge 98e9d8e8e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23732 )
2024-01-11 18:05:49 +00:00
fanquake
c252a0fc0f
Merge bitcoin/bitcoin#28892 : refactor: P2P transport without serialize version and type
...
fa79a881cefa9b5f4fe366669da4a5fa0ed07941fa79a881ce
2023-11-28 11:24:09 +00:00
dergoegge
9e58c5bcd9
Use Txid in COutpoint
2023-11-21 13:15:44 +00:00
