Commit graph

1864 commits

Author SHA1 Message Date
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
d8883c3b97 Merge 1c719f78d3 into merged_master (Bitcoin PR #15006) 2020-10-29 18:09:57 +00:00
Andrew Poelstra
5cb1c16c7d Merge d5931f3676 into merged_master (Bitcoin PR #15870) 2020-10-29 18:02:26 +00:00
Andrew Poelstra
c1dde3c8f8 Merge 41f4c63b38 into merged_master (Bitcoin PR #16036) 2020-10-29 17:58:13 +00:00
Andrew Poelstra
66138a5309 Merge 9d266dbdec into merged_master (Bitcoin PR #15943) 2020-10-29 17:41:14 +00:00
Andrew Poelstra
c3cd785c26 Merge 3503a69ba2 into merged_master (Bitcoin PR #15963) 2020-10-29 17:09:46 +00:00
Andrew Poelstra
332ae826ae Merge e2371f842f into merged_master (Bitcoin PR #14802) 2020-10-29 16:38:07 +00:00
Andrew Poelstra
3fd900ce76 Merge 14959753a4 into merged_master (Bitcoin PR #15744) 2020-10-29 15:57:19 +00:00
Andrew Poelstra
13b3e5bcc3 Merge c459c5f701 into merged_master (Bitcoin PR #15664) 2020-10-29 04:36:59 +00:00
Andrew Poelstra
0929a00ac5 Merge 8ec7121a45 into merged_master (Bitcoin PR #15927) 2020-10-29 02:32:33 +00:00
Andrew Poelstra
3a5a7341ba Merge a3d2d6b067 into merged_master (Bitcoin PR #15930) 2020-10-29 02:14:22 +00:00
Andrew Poelstra
2d57dcb681 Merge d7d7d31506 into merged_master (Bitcoin PR #15141) 2020-10-29 02:10:39 +00:00
Andrew Poelstra
62944887ff Merge f19a3b2ded into merged_master (Bitcoin PR #15949) 2020-10-29 02:07:59 +00:00
Andrew Poelstra
cf22dd0930 Merge 12aa2ac988 into merged_master (Bitcoin PR #15323) 2020-10-29 02:07:08 +00:00
Andrew Poelstra
795fb97df2 Merge 86edb79e97 into merged_master (Bitcoin PR #15841) 2020-10-29 02:07:03 +00:00
Andrew Poelstra
be9a0adaed Merge 2eb8c5d7a2 into merged_master (Bitcoin PR #15758) 2020-10-29 02:06:37 +00:00
Andrew Poelstra
ff3067ebc1 Merge 45d8b71778 into merged_master (Bitcoin PR #15696) 2020-10-29 02:05:58 +00:00
Andrew Poelstra
30390b2eba Merge ce6762030f into merged_master (Bitcoin PR #15897) 2020-10-29 02:05:13 +00:00
Andrew Poelstra
2ec1b95fe8 Merge 67caf2d1db into merged_master (Bitcoin PR #15920) 2020-10-29 02:04:54 +00:00
Andrew Poelstra
9df41a4c44 Merge b025aa3b9e into merged_master (Bitcoin PR #15846) 2020-10-28 22:56:02 +00:00
Andrew Poelstra
0239a1130b Merge 5046d4e911 into merged_master (Bitcoin PR #15896) 2020-10-28 22:35:11 +00:00
Andrew Poelstra
f3ba240a58 Merge f73a3c618b into merged_master (Bitcoin PR #15895) 2020-10-28 22:34:16 +00:00
Andrew Poelstra
83a6652c4d Merge 653b2b4426 into merged_master (Bitcoin PR #15893) 2020-10-28 22:34:13 +00:00
Andrew Poelstra
18ec2e5547 Merge 8cca1fbea9 into merged_master (Bitcoin PR #14818) 2020-10-28 22:33:22 +00:00
Andrew Poelstra
54f9d50f56 Merge 40a720acb8 into merged_master (Bitcoin PR #15697) 2020-10-28 22:32:59 +00:00
Andrew Poelstra
0ee60cdfa3 Merge e9e777e21b into merged_master (Bitcoin PR #15874) 2020-10-28 22:18:02 +00:00
Andrew Poelstra
7e684e97f2 Merge caceff5546 into merged_master (Bitcoin PR #15866) 2020-10-28 20:55:00 +00:00
Andrew Poelstra
7655f06251 Merge 08bd21a3bd into merged_master (Bitcoin PR #15826) 2020-10-28 20:54:52 +00:00
Andrew Poelstra
e316ed34be Merge ae2c19f578 into merged_master (Bitcoin PR #15655) 2020-10-28 20:52:58 +00:00
Andrew Poelstra
52b8a8ee48 Merge e4beef611a into merged_master (Bitcoin PR #14121) 2020-10-28 16:46:47 +00:00
Andrew Poelstra
8d2cc70b52 Merge 429a7cf34f into merged_master (Bitcoin PR #15831) 2020-10-28 16:44:06 +00:00
Andrew Poelstra
550800c07e Merge 598323911e into merged_master (Bitcoin PR #15770) 2020-10-28 16:43:22 +00:00
Andrew Poelstra
1c4e3cbb5f Merge 4f4ef3138b into merged_master (Bitcoin PR #15557)
This restricts the `bumpfee` RPC, when given a feerate target, to unblinded
transactions, because this is the only way I could figure out quickly to
allow adding inputs to an already-created transaction. It appears to be the
strategy used by the `fundrawtransaction` RPC which has similar behaviour.
This should be fixed in a followup PR.
2020-10-28 15:36:05 +00:00
Andrew Poelstra
041d9ca6c3 Merge 0e9cb2d24d into merged_master (Bitcoin PR #15773) 2020-10-28 15:28:06 +00:00
Andrew Poelstra
a8581ea138 Merge 6a135fbe5b into merged_master (Bitcoin PR #15638) 2020-10-28 03:16:57 +00:00
Andrew Poelstra
228f1a27ee Merge 5392aee64f into merged_master (Bitcoin PR #15629) 2020-10-28 03:11:10 +00:00
Andrew Poelstra
d587731748 Merge 93de9abe6d into merged_master (Bitcoin PR #15632) 2020-10-28 02:56:25 +00:00
Andrew Poelstra
8b4b800d49 Merge f9f6c11a74 into merged_master (Bitcoin PR #15771) 2020-10-28 02:12:01 +00:00
Andrew Poelstra
c8a4572c1f Merge f3ecf3025f into merged_master (Bitcoin PR #15772) 2020-10-28 02:02:37 +00:00
Andrew Poelstra
f58b9ee068 Merge 54798c3a31 into merged_master (Bitcoin PR #15749) 2020-10-28 01:51:02 +00:00
Andrew Poelstra
b10d0a931c Merge 327d2746fb into merged_master (Bitcoin PR #15495) 2020-10-28 00:55:06 +00:00
Andrew Poelstra
de7ec6ebb1 Merge efbc86733a into merged_master (Bitcoin PR #15660) 2020-10-28 00:54:56 +00:00
Andrew Poelstra
4ddc27c626 Merge 8dbb2c5e67 into merged_master (Bitcoin PR #15680) 2020-10-28 00:53:05 +00:00
Andrew Poelstra
977c818532 Merge 5a2a9b5b06 into merged_master (Bitcoin PR #15652) 2020-10-28 00:52:44 +00:00
Andrew Poelstra
e790cca639 Merge dc5c2e4407 into merged_master (Bitcoin PR #15686) 2020-10-28 00:48:57 +00:00
Andrew Poelstra
215a7cb64d Merge 3702e1c17b into merged_master (Bitcoin PR #15646) 2020-10-28 00:47:30 +00:00
Andrew Poelstra
addd2da647 Merge 208406038c into merged_master (Bitcoin PR #15519) 2020-10-28 00:11:58 +00:00
Andrew Poelstra
56d472ec04 Merge e14cd04abb into merged_master (Bitcoin PR #15637) 2020-10-28 00:11:51 +00:00
Andrew Poelstra
da079d831f Merge 7b13c64645 into merged_master (Bitcoin PR #15642) 2020-10-28 00:11:29 +00:00
Andrew Poelstra
66d440750b Merge 68520597cc into merged_master (Bitcoin PR #15631) 2020-10-28 00:11:06 +00:00