James Dorfman
8a249f0106
Merge b4f686952a into merged_master (Bitcoin PR bitcoin/bitcoin#25197 )
...
I think I did this right, but please double check this commit.
2024-09-06 06:38:26 +00:00
James Dorfman
2baccdc1ce
Merge 8c721fff3a into merged_master (Bitcoin PR bitcoin/bitcoin#25192 )
2024-09-06 06:37:07 +00:00
James Dorfman
36a5296ad6
Merge bd57b4e0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24757 )
2024-09-06 06:36:57 +00:00
James Dorfman
ceca41c66d
Merge 90e49c1ece into merged_master (Bitcoin PR bitcoin/bitcoin#24464 )
2024-09-06 06:36:48 +00:00
James Dorfman
db3aa6dd4a
Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410 )
2024-09-06 06:21:07 +00:00
James Dorfman
bb39320d03
Merge 8898906370 into merged_master (Bitcoin PR bitcoin-core/gui#593 )
2024-09-06 06:19:50 +00:00
James Dorfman
014520d949
Merge 1368634433 into merged_master (Bitcoin PR bitcoin-core/gui#601 )
2024-09-06 06:07:40 +00:00
James Dorfman
6247002709
Merge aa5cd3cc6d into merged_master (Bitcoin PR bitcoin/bitcoin#25149 )
2024-09-06 06:07:10 +00:00
James Dorfman
7ec702f8f0
Merge 44037a2912 into merged_master (Bitcoin PR bitcoin/bitcoin#25176 )
2024-09-06 05:45:13 +00:00
James Dorfman
858291e891
Merge fbb90c44ac into merged_master (Bitcoin PR bitcoin/bitcoin#25015 )
2024-09-06 05:45:08 +00:00
James Dorfman
0be947179f
Fix failing unit + functional tests for merge of bitcoin/bitcoin#25083 (the previous commit)
2024-09-06 05:18:08 +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
b7d70add65
Merge 5ebff43025 into merged_master (Bitcoin PR bitcoin/bitcoin#25122 )
2024-08-13 22:28:47 +00:00
James Dorfman
f9c08c4566
Merge 66e3b16b8b into merged_master (Bitcoin PR bitcoin/bitcoin#25184 )
2024-08-13 22:08:12 +00:00
James Dorfman
3ddb7ebda4
Merge dfe11a1a7e into merged_master (Bitcoin PR bitcoin-core/gui#586 )
2024-08-13 22:07:15 +00:00
James Dorfman
f686ea0527
Merge 6d20f4b920 into merged_master (Bitcoin PR bitcoin/bitcoin#25178 )
2024-08-13 22:07:12 +00:00
James Dorfman
5383fe6228
Merge b0e16eb3ac into merged_master (Bitcoin PR bitcoin-core/gui#600 )
2024-08-13 22:07:03 +00:00
James Dorfman
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +00:00
James Dorfman
9cb0f04edb
Merge aac99faa66 into merged_master (Bitcoin PR bitcoin/bitcoin#25175 )
2024-08-13 20:39:38 +00:00
James Dorfman
c071c11577
Merge 3aa851ad2a into merged_master (Bitcoin PR bitcoin/bitcoin#24820 )
...
The new test case was calling SelectCoins with a CAmount, I changed it
to a CAmountMap, so that it works properly in elements.
2024-08-13 20:28:46 +00:00
James Dorfman
66bc45020f
Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168 )
2024-08-13 20:10:21 +00:00
James Dorfman
f4311ed9b0
Merge 8c61374ba7 into merged_master (Bitcoin PR bitcoin-core/gui#581 )
2024-08-13 18:22:44 +00:00
James Dorfman
09966d24a8
Merge 8118970c86 into merged_master (Bitcoin PR bitcoin-core/gui#594 )
2024-08-13 18:13:24 +00:00
James Dorfman
ce93bea48c
Merge 0cd1a2eff9 into merged_master (Bitcoin PR bitcoin/bitcoin#23595 )
2024-08-13 17:56:07 +00:00
James Dorfman
9aaf787e72
Merge a7e3afb221 into merged_master (Bitcoin PR bitcoin/bitcoin#25171 )
2024-08-13 17:44:38 +00:00
James Dorfman
6cedfe9231
Merge a39002e0c6 into merged_master (Bitcoin PR bitcoin/bitcoin#25170 )
2024-08-13 07:26:23 +00:00
James Dorfman
c15526e3ca
Merge 4a8709821e into merged_master (Bitcoin PR bitcoin/bitcoin#24830 )
2024-08-13 06:54:30 +00:00
James Dorfman
95c566cd26
Merge d433f59f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25173 )
2024-08-13 06:33:25 +00:00
James Dorfman
e940df7e48
Merge 6407c0e8a3 into merged_master (Bitcoin PR bitcoin/bitcoin#25101 )
2024-08-13 06:33:14 +00:00
James Dorfman
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
2f49eb6ceb
Merge e18fd4763e into merged_master (Bitcoin PR bitcoin/bitcoin#25074 )
2024-08-13 05:28:15 +00:00
James Dorfman
91f7049f28
Merge 345d860f38 into merged_master (Bitcoin PR bitcoin/bitcoin#25166 )
2024-08-13 05:28:09 +00:00
James Dorfman
0e02561a73
Merge fdb82a30be into merged_master (Bitcoin PR bitcoin/bitcoin#25147 )
2024-08-13 05:07:06 +00:00
James Dorfman
cef04ed2a5
Merge 986bae8e72 into merged_master (Bitcoin PR bitcoin/bitcoin#22778 )
2024-08-13 04:41:52 +00:00
James Dorfman
0cf35ca80d
Merge bb83aba6c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25161 )
2024-08-13 04:30:55 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +00:00
James Dorfman
addbcad66f
Merge e016c00e98 into merged_master (Bitcoin PR bitcoin/bitcoin#25126 )
2024-08-13 04:12:40 +00:00
James Dorfman
0027999db1
Merge 002411dc53 into merged_master (Bitcoin PR bitcoin/bitcoin#25157 )
2024-08-13 04:12:31 +00:00
James Dorfman
e060074c3f
Merge 629e250cbd into merged_master (Bitcoin PR bitcoin/bitcoin#25148 )
2024-08-13 03:59:44 +00:00
James Dorfman
78628f6bbd
Merge 139f789d7a into merged_master (Bitcoin PR bitcoin/bitcoin#25124 )
2024-08-13 03:56:29 +00:00
James Dorfman
2264b2fc94
Merge 84bf31f8e9 into merged_master (Bitcoin PR bitcoin/bitcoin#25076 )
2024-08-13 03:56:22 +00:00
James Dorfman
43e19c6320
Merge f7a1e676d5 into merged_master (Bitcoin PR bitcoin/bitcoin#25159 )
...
I was not able to get these minor changes working with our version of the taproot test,
and it did not seem to be worth the time to figure it out.
Please give it a go though, I may have missed something. The diff of the commit
being merged here is only a few lines long.
2024-08-13 03:54:34 +00:00
James Dorfman
febb060594
Merge d5d40d59f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23679 )
2024-08-13 03:41:15 +00:00
James Dorfman
9d137c5a45
Merge dd8a2df488 into merged_master (Bitcoin PR bitcoin/bitcoin#25107 )
2024-08-13 03:41:10 +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
57c149aa06
Merge 0be1dc1f56 into merged_master (Bitcoin PR bitcoin/bitcoin#24062 )
2024-08-12 04:44:23 +00:00
James Dorfman
a738660dbd
Merge 8270740bef into merged_master (Bitcoin PR bitcoin/bitcoin#25114 )
2024-08-12 04:44:05 +00:00
James Dorfman
f83a779f39
Merge 91a42d63ef into merged_master (Bitcoin PR bitcoin/bitcoin#25019 )
2024-08-12 04:33:41 +00:00
James Dorfman
ac98bf499c
Merge 98f4db3305 into merged_master (Bitcoin PR bitcoin/bitcoin#25088 )
2024-08-12 04:23:15 +00:00
James Dorfman
949e4ece60
Merge 187504b038 into merged_master (Bitcoin PR bitcoin/bitcoin#23662 )
2024-08-12 04:04:13 +00:00
