Andrew Poelstra
9f4f65bbbe
Merge 6d1d33d334 into merged_master (Bitcoin PR bitcoin-core/gui#323 )
2021-07-10 21:40:24 +00:00
Andrew Poelstra
f934d41627
Merge 7b87fca930 into merged_master (Bitcoin PR bitcoin/bitcoin#21756 )
2021-07-10 19:10:15 +00:00
Andrew Poelstra
cc70f8d6da
Merge 1ef34ee25e into merged_master (Bitcoin PR bitcoin/bitcoin#21947 )
2021-07-10 18:04:07 +00:00
Andrew Poelstra
dda38f46bf
Merge c857148636 into merged_master (Bitcoin PR bitcoin/bitcoin#21948 )
2021-07-10 16:57:35 +00:00
Andrew Poelstra
713dc12fcd
Merge ecf5f2c1a0 into merged_master (Bitcoin PR bitcoin/bitcoin#21889 )
2021-07-10 15:51:14 +00:00
Andrew Poelstra
7d5047620a
Merge b82c3a0075 into merged_master (Bitcoin PR bitcoin/bitcoin#21929 )
2021-07-10 14:44:01 +00:00
Andrew Poelstra
251048913c
Merge 61fea52171 into merged_master (Bitcoin PR bitcoin/bitcoin#21942 )
2021-07-10 13:37:53 +00:00
Andrew Poelstra
e8f85e9062
Merge b34bf2b42c into merged_master (Bitcoin PR bitcoin/bitcoin#21939 )
2021-07-10 05:28:53 +00:00
Andrew Poelstra
7275a1732e
Merge 4741aec1dd into merged_master (Bitcoin PR bitcoin/bitcoin#21914 )
2021-07-10 04:22:47 +00:00
Andrew Poelstra
d9d4910a7d
Merge a31a1ceec7 into merged_master (Bitcoin PR bitcoin/bitcoin#21907 )
2021-07-10 03:16:24 +00:00
Andrew Poelstra
9096687c0e
Merge 386ba92e83 into merged_master (Bitcoin PR bitcoin/bitcoin#21910 )
2021-07-10 02:10:19 +00:00
Andrew Poelstra
79ae2abb80
Merge db2990d01f into merged_master (Bitcoin PR bitcoin/bitcoin#21925 )
2021-07-09 23:53:45 +00:00
Andrew Poelstra
a34ff22d05
Merge 0ab6ff5e37 into merged_master (Bitcoin PR bitcoin/bitcoin#21931 )
...
Strictly reducing diff :)
2021-07-09 22:47:46 +00:00
Andrew Poelstra
1fd44e5dfc
Merge ee9befe8b4 into merged_master (Bitcoin PR bitcoin/bitcoin#21584 )
2021-07-09 21:14:15 +00:00
Andrew Poelstra
8a9235f184
Merge 79da18a9eb into merged_master (Bitcoin PR bitcoin/bitcoin#21911 )
2021-07-09 19:51:57 +00:00
Andrew Poelstra
a7702d6ab5
Merge 6b49d88a5d into merged_master (Bitcoin PR bitcoin/bitcoin#21905 )
2021-07-09 18:45:07 +00:00
Andrew Poelstra
e56472be53
Merge d2ec37221a into merged_master (Bitcoin PR bitcoin/bitcoin#21796 )
2021-07-09 17:38:32 +00:00
Andrew Poelstra
d8f9c34946
Merge 91db985bc9 into merged_master (Bitcoin PR bitcoin/bitcoin#21927 )
2021-07-09 16:21:26 +00:00
Andrew Poelstra
424ca6c841
Merge 176842daa8 into merged_master (Bitcoin PR bitcoin/bitcoin#21912 )
2021-07-09 15:15:21 +00:00
Andrew Poelstra
120787490d
Merge 01624a7db3 into merged_master (Bitcoin PR bitcoin/bitcoin#21462 )
2021-07-09 14:09:18 +00:00
Andrew Poelstra
99cc7a5245
Merge 2e30e328a7 into merged_master (Bitcoin PR bitcoin/bitcoin#19064 )
2021-07-09 13:03:17 +00:00
Andrew Poelstra
83766e0f3d
Merge 03e16cb027 into merged_master (Bitcoin PR bitcoin/bitcoin#21593 )
2021-07-09 08:50:44 +00:00
Andrew Poelstra
2d5af8c458
Merge 6754e1928b into merged_master (Bitcoin PR bitcoin/bitcoin#21922 )
2021-07-09 07:45:40 +00:00
Andrew Poelstra
37dd8140a6
Merge f0a76b3dbc into merged_master (Bitcoin PR bitcoin/bitcoin#21892 )
2021-07-09 06:40:31 +00:00
Andrew Poelstra
0c0d7cf29c
Merge 88dc09d759 into merged_master (Bitcoin PR bitcoin/bitcoin#21909 )
2021-07-09 05:35:04 +00:00
Andrew Poelstra
edd579466f
Merge e175a20769 into merged_master (Bitcoin PR bitcoin/bitcoin#21644 )
2021-07-09 04:29:45 +00:00
Andrew Poelstra
3402d0aa23
Merge 94f83534e4 into merged_master (Bitcoin PR bitcoin/bitcoin#21752 )
2021-07-09 03:24:22 +00:00
Andrew Poelstra
87cb26b9f4
Merge 39e306009b into merged_master (Bitcoin PR bitcoin-core/gui#271 )
2021-07-09 02:18:30 +00:00
Andrew Poelstra
56c25e5ac7
Merge d2f6d2976f into merged_master (Bitcoin PR bitcoin/bitcoin#21895 )
2021-07-09 01:13:11 +00:00
Andrew Poelstra
9ea813efb8
Merge 4a26705761 into merged_master (Bitcoin PR bitcoin/bitcoin#21902 )
2021-07-09 00:08:06 +00:00
Andrew Poelstra
8d570c2dcb
Merge 4bc3b16349 into merged_master (Bitcoin PR bitcoin-core/gui#293 )
2021-07-08 23:02:50 +00:00
Andrew Poelstra
77bd932406
Merge b49fe0a75a into merged_master (Bitcoin PR bitcoin-core/gui#280 )
2021-07-08 21:57:18 +00:00
Andrew Poelstra
b3ee198bfb
Merge a2bdbdb358 into merged_master (Bitcoin PR bitcoin-core/gui#194 )
2021-07-08 20:52:32 +00:00
Andrew Poelstra
e8208438a1
Merge 8d7125f80e into merged_master (Bitcoin PR bitcoin-core/gui#257 )
2021-07-08 19:44:35 +00:00
Andrew Poelstra
7447a3b352
Merge d8ae29ec8f into merged_master (Bitcoin PR bitcoin/bitcoin#21900 )
2021-07-08 18:04:18 +00:00
Andrew Poelstra
d56bdbd28f
Merge 32692d2681 into merged_master (Bitcoin PR bitcoin/bitcoin#21359 )
...
I hacked up rpc_fundrawtransaction.py a little bit because our `get_address`
method here depends on nobody having called `createwallet` on a particular
node ... the "correct" fix for this would be to redo the Elements changes
to this functional test for the 0.20+ createwallet changes, but because
there will be big future changes to this test (in Elements #900 (PSET))
I did the quick/hacky thing, and will defer cleanups to a separate
post-rebase PR.
2021-07-08 16:08:49 +00:00
Andrew Poelstra
655a4393b2
Merge 8bed1706ea into merged_master (Bitcoin PR bitcoin-core/gui#296 )
2021-07-08 14:02:15 +00:00
Andrew Poelstra
31519bf533
Merge c9b051b58f into merged_master (Bitcoin PR bitcoin/bitcoin#21891 )
2021-07-08 10:44:48 +00:00
Andrew Poelstra
16944dd222
Merge c49d246647 into merged_master (Bitcoin PR bitcoin/bitcoin#21745 )
2021-07-08 09:39:26 +00:00
Andrew Poelstra
400268064d
Merge f8176b768a into merged_master (Bitcoin PR bitcoin/bitcoin#21836 )
2021-07-08 08:34:10 +00:00
Andrew Poelstra
c7b124ac91
Merge 1a60c547fd into merged_master (Bitcoin PR bitcoin/bitcoin#21749 )
2021-07-08 05:07:57 +00:00
Andrew Poelstra
c9aa9a8d18
Merge 1591e35049 into merged_master (Bitcoin PR bitcoin/bitcoin#21708 )
2021-07-08 04:02:44 +00:00
Andrew Poelstra
9c4837db05
Merge adf7843410 into merged_master (Bitcoin PR bitcoin/bitcoin#21786 )
2021-07-08 02:57:17 +00:00
Andrew Poelstra
c40a9ecf0f
Merge 2a22d903f3 into merged_master (Bitcoin PR bitcoin/bitcoin#21897 )
2021-07-08 00:27:49 +00:00
Andrew Poelstra
b30d96864f
Merge 3028a1e384 into merged_master (Bitcoin PR bitcoin/bitcoin#21581 )
2021-07-07 23:22:36 +00:00
Andrew Poelstra
4ab5109c93
Merge 86e04741dd into merged_master (Bitcoin PR bitcoin/bitcoin#21890 )
2021-07-07 22:16:39 +00:00
Andrew Poelstra
b7ec414b10
Merge 5925f1e652 into merged_master (Bitcoin PR bitcoin/bitcoin#21872 )
2021-07-07 21:11:33 +00:00
Andrew Poelstra
adc947f6ca
Merge 8d5a0583c4 into merged_master (Bitcoin PR bitcoin/bitcoin#21869 )
2021-07-07 20:02:50 +00:00
Andrew Poelstra
1254ad9cdb
Merge 21d6fed815 into merged_master (Bitcoin PR bitcoin/bitcoin#21884 )
2021-07-07 18:54:37 +00:00
Andrew Poelstra
e873c758fa
Merge 9313c4e6aa into merged_master (Bitcoin PR bitcoin/bitcoin#21874 )
2021-07-07 17:46:26 +00:00
