Byron Hambly
f209652f80
Merge ce463cf450 into merged_master (Bitcoin PR bitcoin/bitcoin#23750 )
2023-06-13 13:51:56 +00:00
Byron Hambly
8bff356855
Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721 )
2023-06-13 13:41:22 +00:00
Byron Hambly
49326aea37
Merge ab879d9885 into merged_master (Bitcoin PR bitcoin/bitcoin#23762 )
2023-06-13 09:06:27 +00:00
James Dorfman
86f68b94d0
Merge ac92ab6da5 into merged_master (Bitcoin PR bitcoin/bitcoin#23113 )
2023-06-13 05:02:03 +00:00
James Dorfman
3ef3a3ba00
Merge 011d6e429b into merged_master (Bitcoin PR bitcoin/bitcoin#22514 )
2023-06-12 17:32:45 +00:00
Byron Hambly
b80f2e6593
Merge 09ad512369 into merged_master (Bitcoin PR bitcoin/bitcoin#23628 )
2023-06-12 12:43:53 +00:00
Byron Hambly
e3ab195851
Merge c840ab0231 into merged_master (Bitcoin PR bitcoin/bitcoin#22019 )
...
This was a complicated merge that had to be modified from upstream to work with multi-assets,
so it should be reviewed carefully
2023-06-12 12:36:04 +00:00
Byron Hambly
3bd9a6517b
Merge 7ce8d74156 into merged_master (Bitcoin PR bitcoin/bitcoin#23346 )
2023-06-06 11:23:40 +00:00
Byron Hambly
5854e5e087
Merge 7908772244 into merged_master (Bitcoin PR bitcoin/bitcoin#23703 )
2023-06-06 11:15:42 +00:00
Byron Hambly
b2aeec482f
Merge b692e61d61 into merged_master (Bitcoin PR bitcoin/bitcoin#23254 )
2023-06-06 09:19: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
91f2b1114e
Merge 63c63b5533 into merged_master (Bitcoin PR bitcoin/bitcoin#14707 )
2023-06-05 11:19:58 +00:00
Byron Hambly
49b9c8e46b
Merge 89ea2b3809 into merged_master (Bitcoin PR bitcoin/bitcoin#20583 )
2023-06-02 12:25:30 +00:00
Byron Hambly
e4003da763
Merge b7e63306e8 into merged_master (Bitcoin PR bitcoin/bitcoin#23687 )
2023-06-02 12:06:39 +00:00
Byron Hambly
5928338d05
Merge 9a53ba4618 into merged_master (Bitcoin PR bitcoin/bitcoin#23676 )
2023-06-02 11:42:11 +00:00
Byron Hambly
858b1793b6
Merge 42b25025fa into merged_master (Bitcoin PR bitcoin/bitcoin#23644 )
2023-06-02 11:28:46 +00:00
James Dorfman
72a90148c8
Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413 )
2023-06-01 18:51:42 +00:00
James Dorfman
84d20582c4
Merge fd1c9e26d3 into merged_master (Bitcoin PR bitcoin/bitcoin#23653 )
2023-06-01 17:20:28 +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
ee125b1ac7
Merge bce58bbb3d into merged_master (Bitcoin PR bitcoin/bitcoin#22929 )
...
The test failures in wallet_listtransactions.py are fixed by #23659
2023-06-01 13:30:17 +00:00
Byron Hambly
938c11a4f6
Merge af1067c4b7 into merged_master (Bitcoin PR bitcoin/bitcoin#23640 )
2023-06-01 11:02:46 +00:00
Byron Hambly
28823f6118
Merge e7507f333b into merged_master (Bitcoin PR bitcoin/bitcoin#23639 )
2023-06-01 08:53:33 +00:00
Byron Hambly
77acfd01b8
Merge 205877e55f into merged_master (Bitcoin PR bitcoin/bitcoin#23546 )
2023-06-01 08:23:12 +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
e9be7bfc96
Merge 383d350bd5 into merged_master (Bitcoin PR bitcoin/bitcoin#22513 )
2023-05-31 13:50:36 +00:00
Byron Hambly
3e43f34618
Merge 014cae2ee8 into merged_master (Bitcoin PR bitcoin/bitcoin#23591 )
2023-05-31 11:32:20 +00:00
Byron Hambly
97c269b920
Merge 200d97faf2 into merged_master (Bitcoin PR bitcoin/bitcoin#22868 )
2023-05-31 10:07:29 +00:00
Byron Hambly
e6cdd99eec
Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206 )
2023-05-31 09:12:07 +00:00
James Dorfman
c134b5a012
Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512 )
2023-05-31 06:23:55 +00:00
Byron Hambly
00f2e32c8e
Merge 47fe7445e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22364 )
...
- some fixmes in this commit, related to invalid schnorr signatures
which need investigation
2023-05-29 12:58:36 +00:00
James Dorfman
9077ed4666
Merge a42923ce21 into merged_master (Bitcoin PR bitcoin/bitcoin#23348 )
2023-05-26 16:43:18 +00:00
Byron Hambly
3eabe469a8
Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524 )
2023-05-26 11:18:18 +00:00
Byron Hambly
33b01e3a26
Merge 0475a2378b into merged_master (Bitcoin PR bitcoin/bitcoin#23349 )
2023-05-26 09:49:05 +00:00
Byron Hambly
3bb33ac420
Merge 9d2895157e into merged_master (Bitcoin PR bitcoin/bitcoin#23500 )
2023-05-24 14:00:43 +00:00
Byron Hambly
0f48ba8cd4
Merge f63bf05e73 into merged_master (Bitcoin PR bitcoin/bitcoin#22928 )
2023-05-24 12:17:35 +00:00
Byron Hambly
3830688efb
Merge e7feb73f07 into merged_master (Bitcoin PR bitcoin/bitcoin#22805 )
2023-05-24 12:01:42 +00:00
Byron Hambly
cf1c76b7d3
Merge 55dd385524 into merged_master (Bitcoin PR bitcoin/bitcoin#23414 )
2023-05-17 13:52:15 +00:00
Byron Hambly
120f8cad78
Merge aecc08f62e into merged_master (Bitcoin PR bitcoin/bitcoin#23409 )
2023-05-17 12:01:23 +00:00
Byron Hambly
0cad2862de
Merge 77a2f5d30c into merged_master (Bitcoin PR bitcoin/bitcoin#23334 )
2023-05-17 09:41:17 +00:00
Byron Hambly
722506530a
Merge 5adc5c0280 into merged_master (Bitcoin PR bitcoin/bitcoin#23403 )
2023-05-16 13:40:14 +00:00
Byron Hambly
0486fef47e
Merge 3fc3641043 into merged_master (Bitcoin PR bitcoin/bitcoin#22766 )
2023-05-16 13:26:27 +00:00
Byron Hambly
08e1c6bfc2
Merge 7efc628539 into merged_master (Bitcoin PR bitcoin/bitcoin#23385 )
2023-05-16 12:57:19 +00:00
Byron Hambly
4deea21a7f
Merge baa9fc941c into merged_master (Bitcoin PR bitcoin/bitcoin#22787 )
2023-05-16 11:26:08 +00:00
Byron Hambly
6a3f41ea38
Merge af4275e8db into merged_master (Bitcoin PR bitcoin/bitcoin#23332 )
2023-05-16 09:55:15 +00:00
Byron Hambly
60882e24e5
Merge beb45b8b14 into merged_master (Bitcoin PR bitcoin/bitcoin#23311 )
2023-05-16 09:13:09 +00:00
Byron Hambly
a7b053a2d5
Merge b9cf505bdf into merged_master (Bitcoin PR bitcoin/bitcoin#23338 )
2023-05-15 13:08:25 +00:00
Byron Hambly
d3244c4db4
Merge a1d55ced09 into merged_master (Bitcoin PR bitcoin/bitcoin#23139 )
2023-05-15 12:01:49 +00:00
Byron Hambly
45c6a83737
Merge 12eda278ac into merged_master (Bitcoin PR bitcoin/bitcoin#23288 )
...
Added implementation of << for CAmountMap to fix compilation error
2023-05-15 11:28:54 +00:00
Byron Hambly
301914d4b0
Merge 5bb03fba04 into merged_master (Bitcoin PR bitcoin/bitcoin#23333 )
2023-05-14 11:31:25 +00:00
Byron Hambly
dc83a5d546
Merge 02feae54a5 into merged_master (Bitcoin PR bitcoin/bitcoin#23002 )
2023-05-14 11:15:42 +00:00
