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
Andrew Poelstra
7d93f137a0
Merge c033c4b5ce into merged_master (Bitcoin PR #13541 )
2020-10-28 00:09:04 +00:00
Andrew Poelstra
ef17d97342
Merge 27781b6530 into merged_master (Bitcoin PR #15466 )
2020-10-28 00:07:44 +00:00
Andrew Poelstra
32a1b86572
Merge 8e1704c015 into merged_master (Bitcoin PR #15559 )
2020-10-27 23:27:48 +00:00
Andrew Poelstra
760d7ce6f0
Merge c94852e791 into merged_master (Bitcoin PR #15564 )
2020-10-27 23:23:30 +00:00
Andrew Poelstra
5ae23eb085
Merge 887f57eb72 into merged_master (Bitcoin PR #15566 )
2020-10-27 23:22:22 +00:00
Andrew Poelstra
7c2d98230d
Merge 4952a95358 into merged_master (Bitcoin PR #15534 )
2020-10-27 22:50:03 +00:00
Andrew Poelstra
67d718b048
Merge a74d588f21 into merged_master (Bitcoin PR #14954 )
2020-10-27 22:32:24 +00:00
Andrew Poelstra
a599a81d3a
Merge 789b0bbf2a into merged_master (Bitcoin PR #15335 )
2020-10-27 21:39:17 +00:00
Andrew Poelstra
b612189f3c
Merge 9e3122de05 into merged_master (Bitcoin PR #15492 )
2020-10-27 20:46:09 +00:00
Andrew Poelstra
0f6e886bdb
Merge f9dbb319d2 into merged_master (Bitcoin PR #15485 )
2020-10-27 20:06:35 +00:00
Andrew Poelstra
9369666813
Merge a6d7026a45 into merged_master (Bitcoin PR #15497 )
2020-10-27 19:54:52 +00:00
Andrew Poelstra
52cfc0a157
Merge e8612adc5d into merged_master (Bitcoin PR #15507 )
2020-10-27 19:48:05 +00:00
Andrew Poelstra
2b24674400
Merge d88f7f8764 into merged_master (Bitcoin PR #15471 )
2020-10-27 19:13:32 +00:00
Andrew Poelstra
91b410a694
Merge 8f470ecc53 into merged_master (Bitcoin PR #15419 )
2020-10-27 18:04:26 +00:00
Andrew Poelstra
3e41b646fc
Merge 1a8a5ede9f into merged_master (Bitcoin PR #15401 )
2020-10-27 16:19:25 +00:00
Andrew Poelstra
4489ede527
fix missing includes
2020-10-27 16:19:15 +00:00
Steven Roose
3c0f3d7bc7
Disable feature_notifications functional test
2019-05-30 15:14:48 +01:00
Steven Roose
de81c0d97e
MERGE-FIX: Fix linter (mostly RPC help)
...
I also moved some RPC methods that were not at the end of the file with
the other ELEMENTS RPC methods. This makes the diff on my machine look
crazy. Let's hope GitHub has more intelligent diffs..
2019-05-27 17:40:16 +01:00
Steven Roose
efe4e8ff04
MERGE-FIX: Fix functional tests
2019-05-24 17:11:47 +01:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests
2019-05-22 16:54:46 +01:00
