Andrew Poelstra
3bef51bb0d
Merge 7b45c5e875 into merged_master (Bitcoin PR bitcoin/bitcoin#20516 )
2021-07-27 04:38:45 +00:00
Andrew Poelstra
eb5d43150e
Merge 922abe8ca3 into merged_master (Bitcoin PR bitcoin/bitcoin#22268 )
2021-07-27 04:01:05 +00:00
Andrew Poelstra
7efecc9d8b
Merge 6eafa81b32 into merged_master (Bitcoin PR bitcoin/bitcoin#22267 )
2021-07-27 03:23:12 +00:00
Andrew Poelstra
6846865183
Merge dd24567a24 into merged_master (Bitcoin PR bitcoin/bitcoin#22120 )
2021-07-27 02:45:38 +00:00
Andrew Poelstra
2fa63315e5
Merge d50302625e into merged_master (Bitcoin PR bitcoin/bitcoin#22182 )
2021-07-27 02:07:37 +00:00
Andrew Poelstra
1a0a945459
Merge 7c561bea52 into merged_master (Bitcoin PR bitcoin/bitcoin#21935 )
2021-07-25 23:50:09 +00:00
Andrew Poelstra
98800c69d2
Merge 65c4a36e57 into merged_master (Bitcoin PR bitcoin/bitcoin#22258 )
2021-07-25 21:37:56 +00:00
Andrew Poelstra
ebffc84d07
Merge 6bc1eca01b into merged_master (Bitcoin PR bitcoin/bitcoin#22144 )
2021-07-25 21:00:04 +00:00
Andrew Poelstra
ee138548b0
Merge eb63b1db2c into merged_master (Bitcoin PR bitcoin/bitcoin#22247 )
2021-07-25 20:21:46 +00:00
Andrew Poelstra
a92037772b
Merge 3f68f02db9 into merged_master (Bitcoin PR bitcoin-core/gui#362 )
...
Re-added line I (accidentally) dropped in 071510d6a8678594fd33458c6b404ad63dfd60b4
2021-07-25 19:42:57 +00:00
Andrew Poelstra
6b9494054a
Merge 3a2c84a6b5 into merged_master (Bitcoin PR bitcoin/bitcoin#19238 )
2021-07-25 18:35:42 +00:00
Andrew Poelstra
dc6f568584
Merge 5c4f0c4d46 into merged_master (Bitcoin PR bitcoin/bitcoin#21261 )
2021-07-25 17:57:58 +00:00
Andrew Poelstra
4d722d6ce1
Merge de5512e28d into merged_master (Bitcoin PR bitcoin/bitcoin#22230 )
2021-07-25 17:20:16 +00:00
Andrew Poelstra
2f6656f053
Merge ad2ab88ccc into merged_master (Bitcoin PR bitcoin/bitcoin#22224 )
2021-07-25 16:41:48 +00:00
Andrew Poelstra
8923cd37e5
Merge d75a1df617 into merged_master (Bitcoin PR bitcoin/bitcoin#21941 )
2021-07-25 16:03:27 +00:00
Andrew Poelstra
be04e946b9
Merge 964d91b193 into merged_master (Bitcoin PR bitcoin/bitcoin#22130 )
2021-07-25 15:24:50 +00:00
Andrew Poelstra
ae37da1ad8
Merge 9c1ec689f3 into merged_master (Bitcoin PR bitcoin/bitcoin#22102 )
2021-07-25 13:23:19 +00:00
Andrew Poelstra
d4d5a35e7a
Merge b0e5fbf6fa into merged_master (Bitcoin PR bitcoin/bitcoin#22156 )
2021-07-25 12:45:27 +00:00
Andrew Poelstra
525ef7f1db
Merge 6f3fbc062f into merged_master (Bitcoin PR bitcoin-core/gui#333 )
2021-07-25 03:33:47 +00:00
Andrew Poelstra
150d75939d
Merge 4bff49bbb1 into merged_master (Bitcoin PR bitcoin/bitcoin#22172 )
2021-07-25 02:56:00 +00:00
Andrew Poelstra
68aa09da02
Merge 96f828ba4d into merged_master (Bitcoin PR bitcoin/bitcoin#22221 )
2021-07-25 02:17:49 +00:00
Andrew Poelstra
fdeeae492c
Merge 1a369f006f into merged_master (Bitcoin PR bitcoin/bitcoin#18722 )
2021-07-25 01:39:37 +00:00
Andrew Poelstra
65d3a13da4
Merge 9795e8ec8c into merged_master (Bitcoin PR bitcoin/bitcoin#22214 )
2021-07-25 01:01:39 +00:00
Andrew Poelstra
34da23bd1a
Merge a55904a80c into merged_master (Bitcoin PR bitcoin/bitcoin#21866 )
...
Paying the piper for some lazy use of globals, including ones I added
in 8e770d3f21
2021-07-29 13:18:11 +00:00
Andrew Poelstra
5ccf33b742
Merge a8c8dbc98f into merged_master (Bitcoin PR bitcoin-core/gui#361 )
2021-07-24 21:09:18 +00:00
Andrew Poelstra
25981aeceb
Merge f66eceaecf into merged_master (Bitcoin PR bitcoin/bitcoin#22216 )
2021-07-24 20:31:41 +00:00
Andrew Poelstra
83a54cc7c7
Merge 6985038046 into merged_master (Bitcoin PR bitcoin/bitcoin#22118 )
2021-07-24 17:52:37 +00:00
Andrew Poelstra
600fffc549
Merge ce8276b531 into merged_master (Bitcoin PR bitcoin/bitcoin#22190 )
2021-07-24 03:36:23 +00:00
Andrew Poelstra
e39e6e320d
Merge 551933f9ec into merged_master (Bitcoin PR bitcoin/bitcoin#22203 )
2021-07-24 02:58:54 +00:00
Andrew Poelstra
3cc06ba3d2
Merge 1704bbf226 into merged_master (Bitcoin PR bitcoin/bitcoin#22141 )
2021-07-24 02:21:14 +00:00
Andrew Poelstra
b413362d11
Merge ef8f2966ac into merged_master (Bitcoin PR bitcoin/bitcoin#22084 )
2021-07-24 01:43:31 +00:00
Andrew Poelstra
e02d88c140
Merge e87fbee402 into merged_master (Bitcoin PR bitcoin/bitcoin#22208 )
2021-07-24 01:05:51 +00:00
Andrew Poelstra
0649daf81f
Merge 356f421fb0 into merged_master (Bitcoin PR bitcoin/bitcoin#22204 )
2021-07-24 00:28:11 +00:00
Andrew Poelstra
2d998f6f7a
Merge 92584d29ce into merged_master (Bitcoin PR bitcoin/bitcoin#22186 )
2021-07-23 23:50:39 +00:00
Andrew Poelstra
dc84bf8dd2
Merge 46424e943c into merged_master (Bitcoin PR bitcoin/bitcoin#22202 )
2021-07-23 23:12:56 +00:00
Andrew Poelstra
fbe798102e
Merge ca424e242a into merged_master (Bitcoin PR bitcoin/bitcoin#22200 )
2021-07-23 22:35:33 +00:00
Andrew Poelstra
0fe87c64ad
Merge 93e38d5c06 into merged_master (Bitcoin PR bitcoin/bitcoin#22173 )
2021-07-23 21:58:13 +00:00
Andrew Poelstra
29a1e0dbe8
Merge 69577a27ab into merged_master (Bitcoin PR bitcoin/bitcoin#21944 )
2021-07-23 21:20:33 +00:00
Andrew Poelstra
a5d97b363b
Merge 58f8b156ed into merged_master (Bitcoin PR bitcoin/bitcoin#22008 )
...
This isn't nearly as bad as it looks -- use `git diff -w` to see past
the indentation changes.
2021-07-23 20:42:38 +00:00
Andrew Poelstra
d2701c9bad
Merge fe511454e1 into merged_master (Bitcoin PR bitcoin/bitcoin#22174 )
2021-07-23 16:48:08 +00:00
Andrew Poelstra
1756fb7e5a
Merge 68a89d7a46 into merged_master (Bitcoin PR bitcoin-core/gui#4 )
2021-07-23 16:10:31 +00:00
Andrew Poelstra
fe3b514345
Merge 7cac26246a into merged_master (Bitcoin PR bitcoin/bitcoin#22075 )
2021-07-23 14:28:46 +00:00
Andrew Poelstra
b3fdb4bed1
Merge 82bc7faec8 into merged_master (Bitcoin PR bitcoin/bitcoin#21946 )
...
Adds a new test which is broken, but which will be fixed in a few PRs.
Disabled it for now.
2021-07-23 13:50:58 +00:00
Andrew Poelstra
ba389d631a
Merge 45a8b01fad into merged_master (Bitcoin PR bitcoin/bitcoin#22187 )
2021-07-23 12:41:46 +00:00
Andrew Poelstra
aad3d400b8
Merge 76d4018aa5 into merged_master (Bitcoin PR bitcoin/bitcoin#22180 )
2021-07-23 03:59:56 +00:00
Andrew Poelstra
b6205a6f44
Merge e638acf697 into merged_master (Bitcoin PR bitcoin-core/gui#164 )
2021-07-23 03:21:37 +00:00
Andrew Poelstra
3c8e88e7cf
Merge 359f72105b into merged_master (Bitcoin PR bitcoin/bitcoin#21573 )
...
Just did this manually with `-s ours` to keep our current version of secp-zkp.
We should update secp-zkp, but this upstream merge doesn't have any API changes
so it's ok to skip it for now.
2021-07-23 02:42:11 +00:00
Andrew Poelstra
fcc12d7e2a
Merge 3c393ef9e1 into merged_master (Bitcoin PR bitcoin/bitcoin#22149 )
2021-07-23 00:28:01 +00:00
Andrew Poelstra
7fe97f20c6
Merge 912cb59490 into merged_master (Bitcoin PR bitcoin/bitcoin#21795 )
2021-07-22 23:48:52 +00:00
Andrew Poelstra
1b79f721e2
Merge 791f985a60 into merged_master (Bitcoin PR bitcoin/bitcoin#22137 )
2021-07-22 22:15:49 +00:00
