Commit graph

20807 commits

Author SHA1 Message Date
Andrew Poelstra
e1b0ebf5a2 Merge 6ce77a3668 into merged_master (Bitcoin PR #15833) 2020-10-28 17:07:34 +00:00
Andrew Poelstra
7fad8d1ee6 Merge f5aaeae0cd into merged_master (Bitcoin PR #15801) 2020-10-28 16:47:49 +00:00
Andrew Poelstra
269feab9f6 Merge 693c743a32 into merged_master (Bitcoin PR #15843) 2020-10-28 16:47:34 +00:00
Andrew Poelstra
52b8a8ee48 Merge e4beef611a into merged_master (Bitcoin PR #14121) 2020-10-28 16:46:47 +00:00
Andrew Poelstra
1a69098698 Merge dae72998e8 into merged_master (Bitcoin PR #15779) 2020-10-28 16:45:01 +00:00
Andrew Poelstra
8d2cc70b52 Merge 429a7cf34f into merged_master (Bitcoin PR #15831) 2020-10-28 16:44:06 +00:00
Andrew Poelstra
2c542f505f Merge e2b5fdee00 into merged_master (Bitcoin PR #15474) 2020-10-28 16:43:57 +00:00
Andrew Poelstra
e6343c7258 Merge 0c9de67f34 into merged_master (Bitcoin PR #15352) 2020-10-28 16:43:51 +00:00
Andrew Poelstra
550800c07e Merge 598323911e into merged_master (Bitcoin PR #15770) 2020-10-28 16:43:22 +00:00
Andrew Poelstra
161bcd2ae8 Merge 78295e97b8 into merged_master (Bitcoin PR #15788) 2020-10-28 16:43:03 +00:00
Andrew Poelstra
37147c876b Merge 2209b3ba25 into merged_master (Bitcoin PR #15799) 2020-10-28 16:39:45 +00:00
Andrew Poelstra
1613726319 Merge 2a854a1781 into merged_master (Bitcoin PR #15750) 2020-10-28 16:39:28 +00:00
Andrew Poelstra
dc9c535435 Merge 2a191b4846 into merged_master (Bitcoin PR #15802) 2020-10-28 16:16:28 +00:00
Andrew Poelstra
c2ec91b31b Merge 9422e2c29f into merged_master (Bitcoin PR #15792) 2020-10-28 16:05:21 +00:00
Andrew Poelstra
613c74c394 Merge 0c6487c74f into merged_master (Bitcoin PR #15751) 2020-10-28 15:55:30 +00:00
Andrew Poelstra
b865ad1b73 Merge 617261eb1c into merged_master (Bitcoin PR #15809) 2020-10-28 15:37:24 +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
8597b2f437 Merge adc55dbac5 into merged_master (Bitcoin PR #15748) 2020-10-28 15:35:17 +00:00
Andrew Poelstra
dc81e4c808 Merge 66ce95a434 into merged_master (Bitcoin PR #15797) 2020-10-28 15:35:07 +00:00
Andrew Poelstra
041d9ca6c3 Merge 0e9cb2d24d into merged_master (Bitcoin PR #15773) 2020-10-28 15:28:06 +00:00
Andrew Poelstra
9915395a3e Merge bb68abe784 into merged_master (Bitcoin PR #15718) 2020-10-28 15:15:23 +00:00
Andrew Poelstra
fa9e0619fa Merge 570eb7b130 into merged_master (Bitcoin PR #15782) 2020-10-28 15:11:01 +00:00
Andrew Poelstra
f3b06ff713 Merge c536dfbcb0 into merged_master (Bitcoin PR #15639)
asp: the point of this PR was to completely decouple libbitcoin_server from
bitcoin_tool; it removes $(LIBBITCOIN_SERVER) from the `elements_wallet_LDADD`.
I put this back in because our additional code related to pegin claiming makes
heavy use of methods from libbitcoin_server.

If we want to morally accept this PR then we need to do a nontrivial refactoring.
2020-10-28 15:00:23 +00:00
Andrew Poelstra
8291a9baa8 Merge f6120d40d5 into merged_master (Bitcoin PR #15728) 2020-10-28 03:32:35 +00:00
Andrew Poelstra
a8581ea138 Merge 6a135fbe5b into merged_master (Bitcoin PR #15638) 2020-10-28 03:16:57 +00:00
Andrew Poelstra
52dcca25f1 Merge e3a0688f82 into merged_master (Bitcoin PR #15659) 2020-10-28 03:11:38 +00:00
Andrew Poelstra
5af007d081 Merge e82f6ad6f2 into merged_master (Bitcoin PR #15754) 2020-10-28 03:11:29 +00:00
Andrew Poelstra
27d91fd4fa Merge 8c022e8ac4 into merged_master (Bitcoin PR #15746) 2020-10-28 03:11:21 +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
d7e441aead Merge 23712f8ab9 into merged_master (Bitcoin PR #15693) 2020-10-28 02:13:08 +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
ccc0b0afff Merge db2985651d into merged_master (Bitcoin PR #15747) 2020-10-28 01:43:49 +00:00
Andrew Poelstra
0374822983 Merge 8088ff21e4 into merged_master (Bitcoin PR #15765) 2020-10-28 01:07:59 +00:00
Andrew Poelstra
c85c0c1473 Merge 79f73436a9 into merged_master (Bitcoin PR #15757) 2020-10-28 00:55:50 +00:00
Andrew Poelstra
2a125939bb Merge a238fccce8 into merged_master (Bitcoin PR #15763) 2020-10-28 00:55:43 +00:00
Andrew Poelstra
a4ff5d1443 Merge 297ea51caf into merged_master (Bitcoin PR #15760) 2020-10-28 00:55:38 +00:00
Andrew Poelstra
07b4e64805 Merge 414d8461fd into merged_master (Bitcoin PR #15711) 2020-10-28 00:55:29 +00:00
Andrew Poelstra
2ae17352e9 Merge b4e74f938b into merged_master (Bitcoin PR #15446) 2020-10-28 00:55:13 +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
d0fde0a054 Merge e439aeb30c into merged_master (Bitcoin PR #15508) 2020-10-28 00:54:38 +00:00
Andrew Poelstra
3ce8c07674 Merge 35991b162f into merged_master (Bitcoin PR #15755) 2020-10-28 00:53:53 +00:00
Andrew Poelstra
550f2d6486 Merge c83442e174 into merged_master (Bitcoin PR #15654) 2020-10-28 00:53:47 +00:00
Andrew Poelstra
dd652858a0 Merge daef20fb50 into merged_master (Bitcoin PR #15596) 2020-10-28 00:53:40 +00:00
Andrew Poelstra
fcce829ca6 Merge ba54342c9d into merged_master (Bitcoin PR #15685) 2020-10-28 00:53:18 +00:00
Andrew Poelstra
b09684d9a2 Merge 2c364fde42 into merged_master (Bitcoin PR #14853) 2020-10-28 00:53:12 +00:00
Andrew Poelstra
4ddc27c626 Merge 8dbb2c5e67 into merged_master (Bitcoin PR #15680) 2020-10-28 00:53:05 +00:00