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
James Dorfman
bd9a8f7ee9
Merge 07cb4dee5d into merged_master (Bitcoin PR bitcoin/bitcoin#24962 )
2024-08-12 04:02:19 +00:00
James Dorfman
7ec0067a36
Merge 6b87fa540c into merged_master (Bitcoin PR bitcoin/bitcoin#25125 )
2024-08-12 04:02:10 +00:00
James Dorfman
72c9d9e01c
Merge b019cdc036 into merged_master (Bitcoin PR bitcoin/bitcoin#25095 )
2024-08-12 04:01:58 +00:00
James Dorfman
09739a82e2
Merge aa3200d896 into merged_master (Bitcoin PR bitcoin/bitcoin#25109 )
2024-08-12 03:41:59 +00:00
James Dorfman
ab65a98a04
Merge dc0ee57373 into merged_master (Bitcoin PR bitcoin/bitcoin#20799 )
2024-08-12 03:28:06 +00:00
James Dorfman
cb961ed28e
Merge 1511c9efb4 into merged_master (Bitcoin PR bitcoin/bitcoin#24640 )
2024-08-12 03:16:51 +00:00
James Dorfman
1e89511486
Merge 195df1eb88 into merged_master (Bitcoin PR bitcoin/bitcoin#25067 )
2024-08-12 03:03:15 +00:00
James Dorfman
e1547d420d
Merge bc2eee7267 into merged_master (Bitcoin PR bitcoin/bitcoin#25092 )
2024-08-12 03:02:09 +00:00
James Dorfman
8cffafbe9d
Merge b74a6dde8c into merged_master (Bitcoin PR bitcoin/bitcoin#25123 )
2024-08-12 02:51:58 +00:00
James Dorfman
4a39015041
Merge 225e5b57b2 into merged_master (Bitcoin PR bitcoin/bitcoin#25113 )
2024-08-12 02:39:28 +00:00
James Dorfman
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +00:00
James Dorfman
ec0e4e0aaa
Merge 1d5325a8f9 into merged_master (Bitcoin PR bitcoin/bitcoin#25117 )
2024-08-09 22:50:21 +00:00
James Dorfman
b9d7aad319
Merge b3f0a34389 into merged_master (Bitcoin PR bitcoin/bitcoin#25119 )
2024-08-09 22:37:02 +00:00
James Dorfman
613804e4ee
Merge fe1fcdc629 into merged_master (Bitcoin PR bitcoin/bitcoin#25121 )
2024-08-09 22:31:44 +00:00
James Dorfman
ce0d1a8e32
Merge 2709ffb9da into merged_master (Bitcoin PR bitcoin/bitcoin#25115 )
2024-08-09 21:38:07 +00:00
James Dorfman
cac4a07224
Merge dd9f61a184 into merged_master (Bitcoin PR bitcoin/bitcoin#25102 )
2024-08-09 21:19:15 +00:00
James Dorfman
7ae6a9bb4b
Merge e3bab43329 into merged_master (Bitcoin PR bitcoin/bitcoin#25099 )
2024-08-09 21:19:06 +00:00
James Dorfman
7effbfd139
Merge a2a8e919ee into merged_master (Bitcoin PR bitcoin/bitcoin#24925 )
2024-08-09 21:08:52 +00:00
James Dorfman
3742a0ce86
Merge 51527ec1ec into merged_master (Bitcoin PR bitcoin/bitcoin#25051 )
2024-08-09 18:19:06 +00:00
James Dorfman
aaf9fda4c5
Merge 9db941d773 into merged_master (Bitcoin PR bitcoin/bitcoin#25100 )
2024-08-09 18:09:09 +00:00
