James Dorfman
bc4e2c0dbd
Merge 51eebe082d into merged_master (Bitcoin PR bitcoin/bitcoin#25368 )
2024-09-10 20:09:57 +00:00
James Dorfman
c6fee1dac3
Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338 )
2024-09-10 18:55:20 +00:00
James Dorfman
c472e94b84
Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931 )
2024-09-09 21:13:17 +00:00
James Dorfman
aaf41fec40
Merge 79cabe3a5b into merged_master (Bitcoin PR bitcoin/bitcoin#25239 )
2024-09-09 19:39:28 +00:00
James Dorfman
95d6ba74ad
Merge 06ea2783a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25220 )
2024-09-09 17:22:47 +00:00
James Dorfman
c643e814fd
Merge e82d8069bc into merged_master (Bitcoin PR bitcoin/bitcoin#25276 )
2024-09-09 17:20:47 +00:00
James Dorfman
25c2ea0027
Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249 )
2024-09-06 19:20:19 +00:00
James Dorfman
f252fd965a
Merge a0e8aff605 into merged_master (Bitcoin PR bitcoin/bitcoin#25003 )
2024-09-06 16:05:55 +00:00
James Dorfman
d94eb65165
Merge 4901631dac into merged_master (Bitcoin PR bitcoin/bitcoin#25202 )
2024-09-06 06:56:17 +00:00
James Dorfman
e87b9116fd
Merge 192d639a6b into merged_master (Bitcoin PR bitcoin/bitcoin#25213 )
2024-09-06 06:38:54 +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
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +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
9aaf787e72
Merge a7e3afb221 into merged_master (Bitcoin PR bitcoin/bitcoin#25171 )
2024-08-13 17:44:38 +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
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +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
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
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
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +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
2ba1ea256d
Merge cca900e382 into merged_master (Bitcoin PR bitcoin/bitcoin#25104 )
2024-08-09 17:58:32 +00:00
James Dorfman
fcd2946158
Merge 74d9f4bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25068 )
2024-08-09 05:37:14 +00:00
James Dorfman
23e6602afe
Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470 )
2024-08-08 21:07:52 +00:00
James Dorfman
56a93102e0
Merge 606ce05ec2 into merged_master (Bitcoin PR bitcoin/bitcoin#18554 )
2024-08-08 16:40:09 +00:00
James Dorfman
7667ddd21c
Merge 4cf9fa0b66 into merged_master (Bitcoin PR bitcoin/bitcoin#24984 )
2024-08-06 20:19:05 +00:00
James Dorfman
249473e319
Merge 260ede1d99 into merged_master (Bitcoin PR bitcoin/bitcoin#24644 )
2024-08-02 20:43:21 +00:00
James Dorfman
44911e89fd
Merge 833add0f48 into merged_master (Bitcoin PR bitcoin/bitcoin#24989 )
2024-08-02 19:07:55 +00:00
James Dorfman
de50331cdd
Merge f4005af3ec into merged_master (Bitcoin PR bitcoin/bitcoin#24977 )
2024-08-02 18:09:01 +00:00
James Dorfman
a7cc4620eb
Merge cc3877f831 into merged_master (Bitcoin PR bitcoin/bitcoin#24971 )
2024-08-02 17:53:53 +00:00
James Dorfman
56b04fea6d
Merge 23ebd7a802 into merged_master (Bitcoin PR bitcoin/bitcoin#24959 )
2024-08-02 17:42:57 +00:00
James Dorfman
84f5f4cf9c
Merge f436bfd126 into merged_master (Bitcoin PR bitcoin/bitcoin#22953 )
2024-08-02 05:19:51 +00:00
James Dorfman
1af96cd932
Merge b1c5991eeb into merged_master (Bitcoin PR bitcoin/bitcoin#24812 )
2024-08-01 21:46:36 +00:00
James Dorfman
f86857195f
Merge 43bb106613 into merged_master (Bitcoin PR bitcoin/bitcoin#24213 )
2024-08-01 20:20:30 +00:00
James Dorfman
530c5ea7e6
Merge 2095f19db9 into merged_master (Bitcoin PR bitcoin/bitcoin#24859 )
2024-08-01 01:18:15 +00:00
James Dorfman
28023d45b1
Merge d1b3dfb275 into merged_master (Bitcoin PR bitcoin/bitcoin#24855 )
2024-08-01 00:50:18 +00:00
James Dorfman
e17aba0c07
Merge 38d3d0bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#24796 )
2024-07-30 01:52:26 +00:00
James Dorfman
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
c326619931
Merge 1021e4cc68 into merged_master (Bitcoin PR bitcoin/bitcoin#24602 )
2024-07-08 07:26:33 +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
9616104db4
Merge a2e1590f67 into merged_master (Bitcoin PR bitcoin/bitcoin#24673 )
2024-07-08 06:22:20 +00:00
James Dorfman
7ed4614970
Merge 87dc1dc55f into merged_master (Bitcoin PR bitcoin/bitcoin#24714 )
2024-06-21 20:30:18 +00:00
James Dorfman
22ccf93f29
Adapt sendall RPC to work properly in elements.
...
This fixes errors introduced in the merge of bitcoin/bitcoin#24118 in d5b8d28d07
2024-06-21 20:19:03 +00:00
James Dorfman
d5b8d28d07
Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118 )
2024-05-24 18:21:12 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
b45fbd3857
Merge 5f1cc1ad8c into merged_master (Elements PR #1327 )
2024-05-24 15:35:59 +00:00
