Andrew Poelstra
b93cc1efd2
Merge 65ec4d6fb2 into merged_master (Bitcoin PR #15887 )
2020-10-28 22:35:44 +00:00
Andrew Poelstra
e5e8fbc206
Merge ec519d4d54 into merged_master (Bitcoin PR #15903 )
2020-10-28 22:35:31 +00:00
Andrew Poelstra
e490be0579
Merge d76b72a454 into merged_master (Bitcoin PR #15267 )
2020-10-28 22:35:27 +00:00
Andrew Poelstra
6f2a57e2a8
Merge b1e013e4fa into merged_master (Bitcoin PR #13788 )
2020-10-28 22:35:15 +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
bbb4535a9d
Merge c65c77c721 into merged_master (Bitcoin PR #14039 )
2020-10-28 22:33:52 +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
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
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
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
f648151dc4
Merge d1c2ed8dd7 into merged_master (Bitcoin PR #15821 )
2020-10-28 20:51:27 +00:00
Andrew Poelstra
1b0aded1e7
Merge 2d4f70cabd into merged_master (Bitcoin PR #15838 )
2020-10-28 20:43:33 +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
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