James Dorfman
279eb338f2
Merge 1b0469199b into merged_master (Bitcoin PR bitcoin/bitcoin#25281 )
2024-09-10 23:50:55 +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
5c24574c48
Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065 )
2024-09-09 16:46:26 +00:00
James Dorfman
e3a248b168
Merge 39ddd522c3 into merged_master (Bitcoin PR bitcoin/bitcoin#24531 )
2024-09-06 19:31:35 +00:00
James Dorfman
1deb77b104
Merge b752dade04 into merged_master (Bitcoin PR bitcoin/bitcoin#25244 )
2024-09-06 18:49:44 +00:00
James Dorfman
0ddbc5b407
Merge 8779adbdda into merged_master (Bitcoin PR bitcoin/bitcoin#25233 )
2024-09-06 17:09:09 +00:00
James Dorfman
98b29e93c7
Merge 345457b542 into merged_master (Bitcoin PR bitcoin/bitcoin#25214 )
2024-09-06 16:39:50 +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
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +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
d69f2921b9
Merge 5e1aacab57 into merged_master (Bitcoin PR bitcoin/bitcoin#24933 )
2024-08-09 04:43:43 +00:00
James Dorfman
67145b693d
Merge c290249fff into merged_master (Bitcoin PR bitcoin/bitcoin#25058 )
2024-08-09 03:19:24 +00:00
James Dorfman
757c338ae3
Merge 2c56404088 into merged_master (Bitcoin PR bitcoin/bitcoin#25029 )
2024-08-08 20:45:21 +00:00
James Dorfman
9c7341803e
Merge 91ac12be44 into merged_master (Bitcoin PR bitcoin/bitcoin#25013 )
2024-08-08 17:07:25 +00:00
James Dorfman
be5644ff35
Merge dd17c42a16 into merged_master (Bitcoin PR bitcoin/bitcoin#24322 )
2024-08-06 19:29:46 +00:00
James Dorfman
7ad79475b5
Merge 505ba39665 into merged_master (Bitcoin PR bitcoin/bitcoin#22910 )
2024-08-01 21:06:05 +00:00
James Dorfman
18d0ebdd77
Merge 27cfaeed1e into merged_master (Bitcoin PR bitcoin/bitcoin#24098 )
2024-07-09 02:27:59 +00:00
James Dorfman
94e058d3b7
Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147 )
2024-07-08 17:49:09 +00:00
James Dorfman
3233c08a3c
Merge 0baf6aded5 into merged_master (Bitcoin PR bitcoin/bitcoin#24391 )
2024-07-08 17:17:18 +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
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
125e6630d8
Merge f4fba57829 into merged_master (Bitcoin PR bitcoin/bitcoin#24704 )
2024-05-24 00:02:31 +00:00
Byron Hambly
9cbd3e0f05
discount: add policy/discount.h
2024-05-14 19:03:36 +02:00
James Dorfman
3215693c0c
Merge 30041261a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24582 )
2024-01-11 16:51:34 +00:00
James Dorfman
e382a490a7
Merge 310ba92494 into merged_master (Bitcoin PR bitcoin/bitcoin#24537 )
2023-10-16 04:28:12 +00:00
James Dorfman
5dc85e0214
build: add dependencies to Makefile.am for libbitcoinkernel
2023-09-13 11:49:11 +02:00
Byron Hambly
b6d963eea1
Merge 619f8a27ad into merged_master (Bitcoin PR bitcoin/bitcoin#24304 )
2023-07-03 11:19:58 +00:00
Byron Hambly
b33b683775
Merge c23bf06492 into merged_master (Bitcoin PR bitcoin/bitcoin#24115 )
2023-06-30 16:22:04 +00:00
Byron Hambly
207c1ce338
Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301 )
2023-06-30 15:43:32 +00:00
Byron Hambly
57f75b6da7
Merge 3d0850cec1 into merged_master (Bitcoin PR bitcoin/bitcoin#23994 )
2023-06-15 14:45:02 +00:00
Byron Hambly
97d15a5e44
Merge ddcc518cbd into merged_master (Bitcoin PR bitcoin/bitcoin#23828 )
2023-06-15 12:18:15 +00:00
Byron Hambly
b8e9358d8c
Merge e31cdb0238 into merged_master (Bitcoin PR bitcoin/bitcoin#23411 )
2023-06-15 07:42:35 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
eed72186c7
Merge fa3fb46b81 into merged_master (Bitcoin PR bitcoin/bitcoin#23667 )
...
This merge from upstream split the rpcwallet file out into separate
files. Leftover Elements specific funtions were moved into
wallet/rpc/elements.cpp
Co-authored-by: James Dorfman <dorfmanjames@gmail.com>
2023-06-06 08:32:04 +00:00
Byron Hambly
915c3c5606
Merge 8b4d53e4d6 into merged_master (Bitcoin PR bitcoin/bitcoin#23647 )
2023-06-01 13:47:54 +00:00
Byron Hambly
938c11a4f6
Merge af1067c4b7 into merged_master (Bitcoin PR bitcoin/bitcoin#23640 )
2023-06-01 11:02:46 +00:00
James Dorfman
0c2dff3a49
Merge ffdf8ee43e into merged_master (Bitcoin PR bitcoin/bitcoin#23602 )
2023-05-31 16:25:25 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +00:00
Byron Hambly
e6cdd99eec
Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206 )
2023-05-31 09:12:07 +00:00
Byron Hambly
1f15f80bcd
Merge 681b25e3cd into merged_master (Bitcoin PR bitcoin/bitcoin#23152 )
2023-05-31 08:21:29 +00:00
Byron Hambly
433090862e
Merge d0923098c6 into merged_master (Bitcoin PR bitcoin/bitcoin#23491 )
2023-05-26 11:00:12 +00:00
Byron Hambly
2f15858d25
Merge c82284cfdc into merged_master (Bitcoin PR bitcoin/bitcoin#23345 )
2023-05-25 07:54:10 +00:00
Byron Hambly
81d5607ec8
Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114 )
2023-05-24 12:58:57 +00:00
Byron Hambly
548bd0d8be
Merge e77d9679fd into merged_master (Bitcoin PR bitcoin/bitcoin#23006 )
2023-05-16 10:10:21 +00:00
James Dorfman
3b1c914a64
Merge c53e95f22c into merged_master (Bitcoin PR bitcoin/bitcoin#23137 )
2023-05-14 07:06:13 +00:00
James Dorfman
69716bc420
Merge 4229f71bf8 into merged_master (Bitcoin PR bitcoin/bitcoin#23282 )
2023-05-14 03:05:30 +00:00
James Dorfman
be1fc7ead9
Merge a7f28af437 into merged_master (Bitcoin PR bitcoin/bitcoin#22646 )
2023-05-14 00:43:20 +00:00
Byron Hambly
4024f43c52
Merge da13c7b18a into merged_master (Bitcoin PR bitcoin/bitcoin#22392 )
2023-05-11 10:29:04 +00:00
Byron Hambly
9b7c9154fe
Merge c4fc899442 into merged_master (Bitcoin PR bitcoin/bitcoin#22950 )
2023-05-09 12:21:13 +00:00
