Andrew Poelstra
4c22d34cd1
Merge 0936f35f65 into merged_master (Bitcoin PR #15842 )
2020-10-29 02:07:15 +00:00
Andrew Poelstra
cf22dd0930
Merge 12aa2ac988 into merged_master (Bitcoin PR #15323 )
2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98
Merge 2c35fe6238 into merged_master (Bitcoin PR #15849 )
2020-10-29 02:06:12 +00:00
Andrew Poelstra
6674d9e91f
Merge 10ed4dff24 into merged_master (Bitcoin PR #15869 )
2020-10-29 02:06:04 +00:00
Andrew Poelstra
bc1788c1d2
Merge 10852210bc into merged_master (Bitcoin PR #15877 )
2020-10-29 02:04:47 +00:00
Andrew Poelstra
c4a1ce209a
Merge 5873e9a3e8 into merged_master (Bitcoin PR #15919 )
2020-10-29 02:04:39 +00:00
Andrew Poelstra
9178854bec
Merge c1d2b76d80 into merged_master (Bitcoin PR #15913 )
2020-10-29 02:04:21 +00:00
Andrew Poelstra
22bffa44ff
Merge 150be1c7b3 into merged_master (Bitcoin PR #15917 )
2020-10-29 02:04:04 +00:00
Andrew Poelstra
8b992e207a
Merge 3a0d6da098 into merged_master (Bitcoin PR #15371 )
2020-10-28 23:29:43 +00:00
Andrew Poelstra
ae82f80186
Merge bdd7217f2c into merged_master (Bitcoin PR #15901 )
2020-10-28 23:29:30 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
9df41a4c44
Merge b025aa3b9e into merged_master (Bitcoin PR #15846 )
2020-10-28 22:56:02 +00:00
Andrew Poelstra
c31c6e0d89
Merge 703414994a into merged_master (Bitcoin PR #15784 )
2020-10-28 22:37:05 +00:00
Andrew Poelstra
e490be0579
Merge d76b72a454 into merged_master (Bitcoin PR #15267 )
2020-10-28 22:35:27 +00:00
Andrew Poelstra
bbb4535a9d
Merge c65c77c721 into merged_master (Bitcoin PR #14039 )
2020-10-28 22:33:52 +00:00
Andrew Poelstra
f4dc926a91
Merge 4bd7187da8 into merged_master (Bitcoin PR #15699 )
2020-10-28 22:26:54 +00:00
Andrew Poelstra
0ee60cdfa3
Merge e9e777e21b into merged_master (Bitcoin PR #15874 )
2020-10-28 22:18:02 +00:00
Andrew Poelstra
90a5045c3b
Merge cd14d210c4 into merged_master (Bitcoin PR #15463 )
2020-10-28 22:16:27 +00:00
Andrew Poelstra
cbc704afd2
Merge 2d5419feed into merged_master (Bitcoin PR #15780 )
2020-10-28 22:06:46 +00:00
Andrew Poelstra
ad7eb71596
Merge 56376f3365 into merged_master (Bitcoin PR #15670 )
2020-10-28 20:53:16 +00:00
Andrew Poelstra
3f7417909f
Merge b6a5583c4f into merged_master (Bitcoin PR #15853 )
2020-10-28 20:53:09 +00:00
Andrew Poelstra
e316ed34be
Merge ae2c19f578 into merged_master (Bitcoin PR #15655 )
2020-10-28 20:52:58 +00:00
Andrew Poelstra
e901c265e3
Merge 84adc79e10 into merged_master (Bitcoin PR #15829 )
2020-10-28 20:36:28 +00:00
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
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
1613726319
Merge 2a854a1781 into merged_master (Bitcoin PR #15750 )
2020-10-28 16:39:28 +00:00
Andrew Poelstra
613c74c394
Merge 0c6487c74f into merged_master (Bitcoin PR #15751 )
2020-10-28 15:55:30 +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
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
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
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